gentoo auto-resync : 14:01:2023 - 23:53:26

author: V3n3RiX <venerix@koprulu.sector> 2023-01-14 23:53:26 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-01-14 23:53:26 +0000
commit: 3bd85407abc9ed4434c2d3741f84fdb512638b1c (patch)
tree: 15a296c276aca23d87cb4f2181f2249d706ca05f
parent: a90c84e720803f3d26c0ade8f1f1e405ca97502a (diff)
305 files changed, 3254 insertions, 1786 deletions
diff --git a/Manifest b/Manifest
index 4e269bf66ec8..1f95ef30dda6 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29826 BLAKE2B d928aa4df34eaec28b16bbe67de9373984e57b01301452ccecb5259165ae4a5d77edb4896e5d80ea1e2898fcdf7214f7cf437eed83d2f21d9ca93db5dc3fb82b SHA512 229b8481d8231e1c8cca5df5d9149cf037a6eb88b2e468db1fbf3aa67462c4aed103bf79887cf380110e116273eb8ac531c80c5922074cb93ead6d5240051d1b
-TIMESTAMP 2023-01-14T17:09:57Z
+MANIFEST Manifest.files.gz 29820 BLAKE2B b3da3173e1ad6468079b579ddf0239084cbcb7a82644971e5ca1df82ab2a5c248efab4cf763fd3a4c3e7730c81e16a927456b185c5e136f321bced2ac1626338 SHA512 7df1a881c4fec92c8588da59dcd5c97b50f6cbd961646589abbbc6f2b331420eef786d1f0f3eeb18f20f4aaabacfb787b072ac442e73be8ab62069276a2e45fb
+TIMESTAMP 2023-01-14T23:09:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPC4eVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPDNkVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC9cQ/+ObiRZL5vZnIqsxsYCLAYiYXJw+OFEks7mGfW2x5elty3f2F2Q3M0mZB6
-gO1Jqo45y1bzQsYU7RRlTb81kogXVTZIeJQlSZrtI5hIARY1e5Bpq1/iHs0Me4JC
-SZbQzeGJPWCkJ5KtENq8ZVm8p6NjV07de96K0PnLQ/5kkb9MDOyy/X8ve+fzYyJ9
-YxZKKoInvODx5cSk0q6jiERATNXQ3ZG03Yup8Q3O/y7yn8UPMNDPIWDznhizRX7K
-3vJYtJd6nNRRT5oW1tHeBH7RVxR9fA+gFW4it3wzqCXGMR9SfLuhk+aUpZ7kJv2W
-cORBiu7PUw6rz6YHYnr3kfrZk2K5ThBvsAeAed+/mVWcezYT0Z7mwQA6BGJca4h0
-/eyusz094V9les6I6GSC71oPqGDSQMZoldqhpwVExRs999kiaRYyXPgFN/r/TRmE
-rJXFrM2L7N1jKHTkm4JDba8Dq3JEXo4njauOOlifu+jDRocxre9PuXU8gyeZoe+J
-lVBeeXSNUTz7b+nA6H4S6mCIYiGiRr3f7etEB0Fy2p5HlP1y4FVubCNSTos6MAXs
-9i3u32u7qOC7d10gUkq11n4La6yN1c4KQMY1D0xDyZ8QXUFz4Vw5c6+cbZT47iY+
-B6bgmIEGyxvJIrnAr8toK3bBWSRSeHj/2EO3lXOkT+4F0n2xMGA=
-=s0JD
+klBtihAAmsCJQyGO6qfWTHvJCOERjBJLZORNJOgn41ZewYrtR5hbUxCOgT8La0Za
+lM2HZm2FcClagHrHDedbL/cGXZ2H/Sff7NlV2jLykqijVz63CIBKm3fUtiCp4Iq0
+Wl9AP3JQZ1xs2rEW15kUuOL9MBUdOhp+FsXufiuhoz2FnxfG25nFykQZ9mKxl/Hc
+DxHPIgX5ndiwQMUCj+BWMYBAA0nZX3jyJp8jp7abNZseb+s4JVL2jnlvFs1jg7rg
+z9Md2hbk2+nkPTN6GiJBaHzOHr7sCFhSZD2cWyZd2aFEgNdz0953JKokpfZ9m/sa
+m1at6aoLzjHfI+poLlG9/Qi8BERjhDxxkVRAhS2Pj2icq5/b2sGxFkWyYRSMluQX
+fz1G2Vp0gz0xEAgagjh7CL2NgT7+Q3nDfmJVEI0z9h5bYFoI9nVpHDDt6chJObzG
+Gtu1Yu/ga3mTAs5mApIqrpqJpRQ5JMKiidSkVFwV9ErIG7VFNCT0nvsy+FBSsWAJ
+Xm4r0Pc7lg+kOSYIc4PqukF70jhKIloG3reNsKFCvxXYW1EhOo4GcA7WN/WaoMVa
+a+tPXCUoSA6O+ndf3e/lg4hdY52rewHFk+ov0zdzlIq0WhDtFcl2A3IIZpB9ACTH
+F6G9ySG5rx5QqPodpq2bcbnqN7wbl5O6CpmIgZXxZVIa+8p0bDU=
+=L0mm
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d71013d995e6..7da29e61b62d 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 24b1676e7466..b4f5fa3040fe 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/squid/Manifest b/acct-group/squid/Manifest
index 6c34645da63e..111c447a868a 100644
--- a/acct-group/squid/Manifest
+++ b/acct-group/squid/Manifest
@@ -1,2 +1,2 @@
 EBUILD squid-0-r1.ebuild 146 BLAKE2B 97e33f7c900973579aa8f30605a6ffc083cbcd212def08ba2cb4be2b6cb589a4576806e49a083d8d87a2cce9ccaeb2d32018aef06e7f130cc70cf4dbb7bcec41 SHA512 3e27a860e4cb3fe8c25c752e55530ce9d1cecae28a8785f143aba640e68687f04f4b054cd98dffb73a6d434f1db585ad4a7575a3f0925a351177bbae24b0dc79
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
diff --git a/acct-group/squid/metadata.xml b/acct-group/squid/metadata.xml
index 115e9d64a669..64b269faa688 100644
--- a/acct-group/squid/metadata.xml
+++ b/acct-group/squid/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>hlein@korelogic.com</email>
+		<name>Hank Leininger</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 6aac53eee1a5..38e475bfca6c 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/mpd/Manifest b/acct-user/mpd/Manifest
index e39e1904e770..4897522f7629 100644
--- a/acct-user/mpd/Manifest
+++ b/acct-user/mpd/Manifest
@@ -1,2 +1,2 @@
 EBUILD mpd-0-r1.ebuild 274 BLAKE2B ce5f2a0b9b442b3749bc8c25a213d58813ad809cc3853268358333f9efecc39f037beac7fe3709521e91f951538eb9c7b06a749ac7dccf5065f045858bb71e5b SHA512 2397cff726b2c9e173e30399efa6cd4160222fc403135052943204b4462e594a067c1f291281f69e757950706a160b6dc9e07e2a0e53c417aebeb8ab4724ceff
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 371 BLAKE2B 1dc95f39908a3eaa277959b6434e6167edde97094d80c15895328586207abed46ab15e2aaf48751945f62888442279c9832fae1f5276c276522239afbee1c68f SHA512 79dba2ab8e6a18dbd7c10d95bdbb7a0b2bd8b639c98982e1cd325a5709b9984d713cb81c639165b4055a39d4993f44a746dba9db87f0f66acbc3b34d6f210103
diff --git a/acct-user/mpd/metadata.xml b/acct-user/mpd/metadata.xml
index 115e9d64a669..ece09d453dee 100644
--- a/acct-user/mpd/metadata.xml
+++ b/acct-user/mpd/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>nex+b-g-o@nexadn.de</email>
+		<name>Adrian Schollmeyer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/acct-user/squid/Manifest b/acct-user/squid/Manifest
index 83ee22f70d6d..caddc646fc8e 100644
--- a/acct-user/squid/Manifest
+++ b/acct-user/squid/Manifest
@@ -1,2 +1,2 @@
 EBUILD squid-0-r1.ebuild 275 BLAKE2B ac7ec04e332a257ed77aebd1d877edf95b32211f90a492159b071f6b3dc578e7a074e932068a425609db0583dad52d7dbaffe30b405ce7ab3e17a3b024db20c5 SHA512 bbdf6c82363ced54f1bef26c6bbb78ffe9c0dd1a2f32b46c3d4dae43fd047f3ebf387a82c30d91d5bb56139e0fa7cad45819bf03a888adfad5a90835d8c3a2a3
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
diff --git a/acct-user/squid/metadata.xml b/acct-user/squid/metadata.xml
index 115e9d64a669..64b269faa688 100644
--- a/acct-user/squid/metadata.xml
+++ b/acct-user/squid/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>hlein@korelogic.com</email>
+		<name>Hank Leininger</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 1fbcf2ab473a..c286b217eb3e 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index f4241021dd52..2577318d68e2 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -8,8 +8,10 @@ DIST dpkg_1.20.12.tar.xz 5009108 BLAKE2B 47ecb53c331503c72081a4c472acd6e94a5b7fc
 DIST dpkg_1.20.9.tar.xz 4954428 BLAKE2B 4e04f7a90c8696971895081e18b220d9dee4bc5930428f131556ae71c673e61e18c363e279b566c2218da60a5aca421807c14cf518952502e707c7397769097b SHA512 904a4742f5f340dc65b2137364dce102a0b2eb42ccedb2a73f79c207362c699fbffaaf1379f1f6c8b8b0e490321af1d03c34b50ebe0c703f5ce8a7f75f17a839
 DIST dpkg_1.21.1.tar.xz 4986936 BLAKE2B f5b0f9fe7ac5fe7ba47191a9e467356e748418846ce0fc9f3c61d731e035eb096932848b15e6a85a15938d3bbd6fa069c786ab0e89c77119958fe632a91c309f SHA512 3f3f263e1300f3e4b55e84521847703dcfe465aa54829a69c31c174a2ad5e8b6a8a251da7c6020d31a38e9e6744113924a71e9579469e32289328e91a48db07f
 DIST dpkg_1.21.15.tar.xz 5350148 BLAKE2B f26611db365266ef9f43484c20d3150889238b34b156cac26f0ae8ae9572e7e4a9839e08a0073a25c886cd2891fc6d84afc97262ae6992267b47fa6e86c03a33 SHA512 eb31db63dd454048c3b7539b539720ed71239303ca679df92b934e971914d63dd771da09149054048e24dde1f5627ee24d43dbd8782ca1dc28c4a2bd3ed8f26a
+DIST dpkg_1.21.18.tar.xz 5355160 BLAKE2B 448f1500c19da97f535630ff231b19852727e6d838c66d86edc8f92615fbebeef1d31ac26d9f86ec7e4cd018ffb9f2f40ab1a2987aa60187f995dc901f99119d SHA512 a0fd2fc0ebffd1c1939b50fb5ba0e13864ef8f6b22dbdb2b2452380add7a723edf2a194010e43faf60803042e6652d4c28356c778e0d0f05ca84463ae1e1ce80
 EBUILD dpkg-1.20.12-r1.ebuild 2094 BLAKE2B 223c1a0fb84047b8fa33bb86127b6a01c699035aadd8244ee5bcfcca555f39cf5e8364665bf557e39257eb86a1582bf9ae6a852cf4c574752b1a08dbd4e6bda7 SHA512 455b2a89f88cc46f14e705244165b5ab7d0f44f9a266c56fc1859b54492b856aabd4585fa9dbe52f5af1a7a61636052cc04d864dc18c6ca4b0338e998478f67d
 EBUILD dpkg-1.20.9-r1.ebuild 2039 BLAKE2B 581e7a5a5f1814a2571694eb46911bf5a903582f911a989885ce9dbbec6c1517748e741c87a9472258d701cf4ed1ff0c4d0e83fd44432d672b01bed88c0b6109 SHA512 930a798ff3f057fcb8603751d70ea1b5d6cea379290681bccbd70270aac0bcc69c187dcc302231f2fa7e5a461e4d70edacc1057a3147d9adfaca596ab52ad5f3
 EBUILD dpkg-1.21.1.ebuild 1990 BLAKE2B 3aff143bc3013658754a67e43ca6f9aacd43372cf32ac3821321c1ff454d30a08c62edafc9eafd6444de9c39d082f625fc73df86c89ef142ec5b7d8535ace1b4 SHA512 c47497584a0ab84311361eab048da24c23ba422478210f366e7f8a0f8223fb498e930fedaa0b72e4a0ef2062f67f338b681501c0eafa05d36be3759884f7579b
 EBUILD dpkg-1.21.15-r2.ebuild 2355 BLAKE2B 2277406e12148a3e1498eb3d19b568249a5b785dbf0dca30fa4e1fcd96302600f78787cc51087c0c95a4c76fbf42af0650d60eefc72714125fd0b2025feb46a8 SHA512 bd7f987fd8c84c0531e8b6ca2d208bb99a64c1e54496cc17fd8573e1fffa3c88527eae32ae03be9391d22cf81347cbd08f58f4d3847d4c91221d0621ff5b8875
+EBUILD dpkg-1.21.18.ebuild 2376 BLAKE2B 0256208e6735254b3ccd2a0354ea9e0e4352b94faf4b0d626f7afc517bd649a9b46a18c51b7b5d4b9437c97dc89ed98c7cf7e4e00e9fcf874c39af0102fd5441 SHA512 8aa8cd29dab16028a034ae6adc62633b7482ebe5a5e5f9550b17ed696b8572e8b1ba5ff9aabb7eace3c4d85f2981ba58a37c8f16a5e42aa85497aafc0e864819
 MISC metadata.xml 433 BLAKE2B fe1e0ca0c96628891b711ca120d5c119f8effe66ce43198ebb2a16fce1cea23b7ab6ab88d807a71645298e2311bc3044dca4989fe83cf99e54a9e97f66835c69 SHA512 2882194685980d67acc10913c8863b55dc0a9215558db2e3cf33f0489d91e5477bf2ac0c0fc5b4a134f45593f6f5d3fde5e09493d20ca45224645b8c1c597fef
diff --git a/app-arch/dpkg/dpkg-1.21.18.ebuild b/app-arch/dpkg/dpkg-1.21.18.ebuild
new file mode 100644
index 000000000000..9853cc616b20
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.21.18.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Package maintenance system for Debian"
+HOMEPAGE="https://packages.qa.debian.org/dpkg"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+bzip2 +lzma nls selinux static-libs test +update-alternatives +zlib +zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/gzip-1.7
+	>=app-arch/tar-1.34-r1
+	app-crypt/libmd
+	>=dev-lang/perl-5.14.2:=
+	sys-libs/ncurses:=[unicode(+)]
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? (
+		dev-perl/IO-String
+		dev-perl/Test-Pod
+		virtual/perl-Test-Harness
+	)
+"
+BDEPEND="
+	sys-devel/flex
+	nls? (
+		app-text/po4a
+		>=sys-devel/gettext-0.18.2
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.12-flags.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|\<ar\>|${AR}|g' src/at/deb-format.at src/at/testsuite || die
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR CC
+
+	local myconf=(
+		--disable-compiler-warnings
+		--disable-devel-docs
+		--disable-dselect
+		--disable-start-stop-daemon
+		--enable-unicode
+		--localstatedir="${EPREFIX}"/var
+		$(use_enable nls)
+		$(use_enable update-alternatives)
+		$(use_with bzip2 libbz2)
+		$(use_with lzma liblzma)
+		$(use_with selinux libselinux)
+		$(use_with zlib libz)
+		$(use_with zstd libzstd)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local DOCS=( debian/changelog THANKS TODO )
+	default
+
+	# https://bugs.gentoo.org/835520
+	mv -v "${ED}"/usr/share/zsh/{vendor-completions,site-functions} || die
+
+	# https://bugs.gentoo.org/840320
+	insinto /etc/dpkg/origins
+	newins - gentoo <<-_EOF_
+		Vendor: Gentoo
+		Vendor-URL: https://www.gentoo.org/
+		Bugs: https://bugs.gentoo.org/
+	_EOF_
+	dosym gentoo /etc/dpkg/origins/default
+
+	keepdir \
+		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
+		/var/lib/dpkg/{alternatives,info,parts,updates}
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index ab95f769033f..97d8542e177c 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -3,6 +3,6 @@ DIST gzip-1.12.tar.xz 825548 BLAKE2B 7e2d482c08555f5fb0ff5408c0afe48c61034e9779e
 DIST gzip-1.12.tar.xz.sig 833 BLAKE2B ab7b4a759ef163d67f20773607ba0408ea9f1f7c7c224f43635fc3752acc521b74dbea4ec9ebb58a2f4fa13ecae19e00779b4b56c2cb95976301445beff817aa SHA512 1f4702797f7c5f1873c2f9c2f6210ba23824455d17ee82f50f0bf24240ed5bdf0090cf85338ccf76ba82422f8b4ad3a329d8bbf1350cb094d7bd61aa45550397
 DIST gzip-1.12_p20221228.tar.xz 806448 BLAKE2B 278eb44caca7ee16ca5d0210673726a1daebef6da7eaf0a87fc24590cb4c53d4ebe2decb6b8975440e1eb2c2cfebb69f091c658f9a7430a1717f0477fec279da SHA512 87d1fccb9603ec336c89689337e3cf3cfef70054ab4416bd8380fee011e9f517555d80a2a009bd312a58c34fdaf48778e5f0e9bea350ae280b440a325a837866
 DIST gzip-1.12_p20221228.tar.xz.sig 833 BLAKE2B b59d4677d15e2461d5fa95b4d53e94914e14cad613a9766aa3e51bfcece84ec0c4dd752c0d124cb76cc2240f9460f809c5bbbab958522c795e94026c8d4206ef SHA512 09a3a6687c80d7ec7e97ebd4c679e4d162729232d77966352c2f7ddd45594d79039ff33a93592889137605412b18b7868ea19ba4f4d162a5912a3978b3d67dd2
-EBUILD gzip-1.12-r3.ebuild 2216 BLAKE2B 0e504b091287555832c27f125e50641fdb517467ff815573242a7aa6a0850e25d6343ed3a2d49f381ff87b2391d131106fb75052d32c2a7e595cdaef76d44394 SHA512 5d4468f39482473c4fbfb2241a2ed80273aaf0e9f43db141b057a0e022df92e67895216f3dec2061ee9f61f65db84120e8544ed1d74628ee7eb07e361287585d
-EBUILD gzip-1.12_p20221228.ebuild 2573 BLAKE2B 46ebe00941e3f84347d16f7dea5837b2d930c2705e8f6f7d52c745c8b851e711f8fa86cb9bdb8b4ab7ca46a93c54403abca24884371ddf43ffa4e1d815cddb56 SHA512 900099e0e672a4820cff49c808d96dc9bffad0068282c1ce8814fc26e0cb1d639e936d56435099b7c10926454670e79de57662c8791d058be916b1cebf2b2874
+EBUILD gzip-1.12-r4.ebuild 2131 BLAKE2B 2c224324e98e391123a46d32da2562a2749a198bbd067c52c666db31aec91238f2ebd58ba72185c38af5cd2a00ae50022666e655b4b3666a263243033dae2bc2 SHA512 7ea4adc05098d169c15da62391575926f14fe15f203a53f8fc3e50b515d9cd630de74bda3194a6883ea54ab05cca16e2073d51aeb6f5057e1e6a4e6e764451e6
+EBUILD gzip-1.12_p20221228-r1.ebuild 2488 BLAKE2B d1bc7f69dc84b0eb8f5df0deae24142b76b2f412593eed811fa22d08ef5d4b98f788262556ebd989523c72e5fcbe197d58cac63293c5fa0703daf1c6b5828867 SHA512 f3bb3ea65616b9fa82d256e9634514c51a579d3c24849b75cd9d5cf652891d19d143923f540a3fb5d0c464fb5ebce29cf3ab906629786c04eac05d2cb32d1044
 MISC metadata.xml 422 BLAKE2B b3ba7db4fdf23c9b1b801f21a3230898f260b131344538ff8644bc842dcd5f6bef5e4e2f8d475267d6d39047a87c00e1138e69d49892d21d58249346bde1e57c SHA512 6241ec1357f2f326c745589a18622987e9444e515157a53cb1188a21cd90e14e392db1e31b24f833ba05647ddfcfd6a89e13f6125ca15451bceb1a14e80fbc23
diff --git a/app-arch/gzip/gzip-1.12-r3.ebuild b/app-arch/gzip/gzip-1.12-r4.ebuild
index 652ddbb3151e..acc085235bb1 100644
--- a/app-arch/gzip/gzip-1.12-r3.ebuild
+++ b/app-arch/gzip/gzip-1.12-r4.ebuild
@@ -56,8 +56,6 @@ src_install() {
 	for x in gunzip gzip zcat; do
 		mv "${ED}/usr/bin/${x}" "${ED}/bin/${x}-reference" || die
 	done
-	sed -i -e 's:exec gzip:&-reference:' \
-		"${ED}"/bin/{gunzip,zcat}-reference || die
 	mv "${ED}"/usr/share/man/man1/gzip{,-reference}.1 || die
 	rm "${ED}"/usr/share/man/man1/{gunzip,zcat}.1 || die
 }
diff --git a/app-arch/gzip/gzip-1.12_p20221228.ebuild b/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild
index 5e5dd9d96e0a..23e799f74e59 100644
--- a/app-arch/gzip/gzip-1.12_p20221228.ebuild
+++ b/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild
@@ -71,8 +71,6 @@ src_install() {
 	for x in gunzip gzip zcat; do
 		mv "${ED}/usr/bin/${x}" "${ED}/bin/${x}-reference" || die
 	done
-	sed -i -e 's:exec gzip:&-reference:' \
-		"${ED}"/bin/{gunzip,zcat}-reference || die
 	mv "${ED}"/usr/share/man/man1/gzip{,-reference}.1 || die
 	rm "${ED}"/usr/share/man/man1/{gunzip,zcat}.1 || die
 }
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 7fcdd9942799..e3bfbb603466 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index e3c9145d018c..4e6f8c5456b5 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -4,5 +4,5 @@ DIST ccid-1.4.36.tar.bz2 677047 BLAKE2B b3d48f1c51b64d260b7055251fb04aeea4a22cc5
 DIST ccid-1.5.0.tar.bz2 689961 BLAKE2B e5621f9af647028787cddd1b5a0d674420b4bf0c532a8527b4e10773bbd8af6f6600e7c40039e27f1ae182504d4b69b5e1e4aae509154ebd9653a34bd085f820 SHA512 fa2eac306066255fd89e8220e2b8d82811ce9e284baa155ea968b7afe0f113a94b1ee1898578d02fb8cde0634b6fe60ae8af956089ce5401c11bb90c3b334d5a
 EBUILD ccid-1.4.35.ebuild 1547 BLAKE2B f9c400087032250e51f1103a4ea19491fbc68b47f4a02ff9474a7182b7dcc7405f4e128d9f02663685e4e33bb565354e2550f27ad86a253181c2c63e31cc50ee SHA512 267e3b6d789a33ebc01d0586524c423cbf03434ff34040d39c1039be235f982546b39acad51b38d4deb779786a542d5c5f843f3464abe8d3d30712d156a35197
 EBUILD ccid-1.4.36.ebuild 1559 BLAKE2B 6b86ca4567944315a7657d089d24ad5fd43d57bc07ec57df76be6c76429af1b6d49d14fceb5a7ca03d91df56a53c43c6583e6ac1f7fa014ba0733f36a2a8b393 SHA512 35f30a6ee169905978a247f8c82b7ab2e26b27f004c6077137cc083efd5098cf44ebb3a39e1582abbb25d9024783eddf91ab2e072d5f5e87364ab8e7ac6a3d89
-EBUILD ccid-1.5.0.ebuild 1559 BLAKE2B 6b86ca4567944315a7657d089d24ad5fd43d57bc07ec57df76be6c76429af1b6d49d14fceb5a7ca03d91df56a53c43c6583e6ac1f7fa014ba0733f36a2a8b393 SHA512 35f30a6ee169905978a247f8c82b7ab2e26b27f004c6077137cc083efd5098cf44ebb3a39e1582abbb25d9024783eddf91ab2e072d5f5e87364ab8e7ac6a3d89
+EBUILD ccid-1.5.0.ebuild 1623 BLAKE2B b2f825e2c910b91e3cd506447782002a5086b833e159cc225e1166353658f006e935e5cba146ed05a84504a6f46960bc1f154f0656aab0919482fd30d3de3cdd SHA512 177ea8caae0312dac2709fdfdc2423e652dfcb39adc8819952949f1e9b9a9763f6b544bffcf84317938e83c4d6dca5e4698343fa6e0b27bd6da36029d8df7282
 MISC metadata.xml 410 BLAKE2B e62b5075deab55dab4f862dfe242085935f383cd51d35f3a61a7e2aeb4d913f3352980d28cdd7ff4ac41f5bf0adf44c763f8267a8e141908fd4371e4656cbc87 SHA512 aabb5b8462ef6146d0230a6d67656fbc8fb2e4a25036e72b4ce9fa3a7ffb29ea1ae0d7eb8bc474343ea654dec649d13749fa844516689ae3f3e33734e0a24d3a
diff --git a/app-crypt/ccid/ccid-1.5.0.ebuild b/app-crypt/ccid/ccid-1.5.0.ebuild
index b77236eb75b6..f3f558b52749 100644
--- a/app-crypt/ccid/ccid-1.5.0.ebuild
+++ b/app-crypt/ccid/ccid-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -59,3 +59,11 @@ src_install() {
 
 	fi
 }
+
+pkg_postrm() {
+	udev_reload
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 92877a51bf02..8fe6795c8e37 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,6 +1,6 @@
 AUX rhash-1.4.2-clang.patch 2775 BLAKE2B 0160a245931d58eb4809e95b5ab8a515fadf1459714378f254c597d56f3c4336ee59b17152c3fc23ae4ca39a4cc076eb78783e609b847b0c276c8f8c37fdd940 SHA512 3b28f8234d42f7dc46a8b890e5ba6f49e61f3db26019e81bfe8d4318b28d71ca781c49f0ee09c387a1cbef626ad016fc3177037f2d504be7572d56ed836ff954
 DIST rhash-1.4.2-src.tar.gz 416853 BLAKE2B 06322825116cb00aa4987b01610d967eb57c94aa29b43348ec2c31f053fd471a900fcee776714263213e9a79eaf389b2e79d7b34a5afd3e98d68198193b5cbe7 SHA512 41df57e8b3f32c93d8e6f2ac668b32aaa23eb2eaf90a83f109e61e511404a5036ea88bcf2854e19c1ade0f61960e0d9edf01f3d82e1c645fed36579e9d7a6a25
 DIST rhash-1.4.3-src.tar.gz 429290 BLAKE2B d225aeae0b3a8fb2e093a9aef50cd07a790c7e9734e91114deef2ca8492c85261b8ed5dea45958e35e049ea888885175608962ea72297bdef48b00c52f51eaca SHA512 d87ffcde28d8f25cf775c279fed457e52d24523ed9b695629dae694b3c22372247d18f6032f8ce13a0b70fa2953be408982e46659daaa7c4ab227ae89eaed9c7
-EBUILD rhash-1.4.2.ebuild 2067 BLAKE2B 4e11b3ed29cc0741ae3c1fab950343df0f605e4d7c204262a687acc476f9694366ab659b59b4ecb9ed25bbbf8c1e61dd732df3510db0519aad9e665291b96cea SHA512 cb08d598b66308dfa20adcdb66d4b8f090f496efe77caf8de3e8692ea06a396e46810e9ac68157fcb54861a1948fd17ccd37d45bca5cfff2a77b823baf4075f6
-EBUILD rhash-1.4.3.ebuild 1919 BLAKE2B 106b22c08dd9f12eb55ff0e60b83a446970a99e18f7f4525325074c53b9544d16830eebb4a1556dbc3ca999a985be985cfdfe156527686bc920a41a24ace9239 SHA512 91738fc523d69c51486bc9b3d24304316250850b31a9282f2ab0c02781f7b9f5985af95368555aa2a15cc1a04b3ed0a75d65eee17089f7de244ed7a0165bf601
+EBUILD rhash-1.4.2.ebuild 2341 BLAKE2B 7996d0882a94d4c9491a657131551c435f7d58f2bd122144b7a903aea8b0a771e9b8f47925beab4186a78582a94814db65e271b1fe8a53c8e3455b535f8a229a SHA512 b0680600850ba7931530c102579b74afa14b5b83015293bb6143f0df0815e6ddac8e41f58e9c6c4aec9604f1af856fa8451ad81ca7ab46586ceb66859b359f1c
+EBUILD rhash-1.4.3.ebuild 2193 BLAKE2B 6765f19fb2d9224aaad5f642d75afbcacef8ab5c992b239e4710d2087e6a300225f74ee742f80c9700950af1066b6a71ae0cf4aa9b5f9b517a490c6c011d7a62 SHA512 c44baf853423913d702d765b348fdd08ad4cde04c3d7ba536e9b9191d87720b0aa9bbd8f1e89cd2627ec3e6941d8bd62ba19f713942f105d10fcfc8ce8175df8
 MISC metadata.xml 817 BLAKE2B eeb15cde9e06507f73330759d44dca59dea3bbcb972cb25af71d91f065eb64dbd1ddc61e43f8fad50c264c269542f92efdace36d3397647c3c53972e695da22f SHA512 3e2f688b57c74e051fcfb90d34685346c459c5e9f425266fd3d8e099f586037b14c2bfdac76f135a046c77cc850bb49954c0e7d8dc9ded1db47bf0919ab3ea93
diff --git a/app-crypt/rhash/rhash-1.4.2.ebuild b/app-crypt/rhash/rhash-1.4.2.ebuild
index 28eb73baa382..85a78659e4d4 100644
--- a/app-crypt/rhash/rhash-1.4.2.ebuild
+++ b/app-crypt/rhash/rhash-1.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs multilib-minimal
+inherit flag-o-matic toolchain-funcs multilib-minimal
 
 DESCRIPTION="Console utility and library for computing and verifying file hash sums"
 HOMEPAGE="http://rhash.sourceforge.net/"
@@ -46,6 +46,13 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	set -- \
 		./configure \
 		--target="${CHOST}" \
diff --git a/app-crypt/rhash/rhash-1.4.3.ebuild b/app-crypt/rhash/rhash-1.4.3.ebuild
index 3836fca5035c..1cfc029f4978 100644
--- a/app-crypt/rhash/rhash-1.4.3.ebuild
+++ b/app-crypt/rhash/rhash-1.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs multilib-minimal
+inherit flag-o-matic toolchain-funcs multilib-minimal
 
 DESCRIPTION="Console utility and library for computing and verifying file hash sums"
 HOMEPAGE="http://rhash.sourceforge.net/"
@@ -42,6 +42,13 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	set -- \
 		./configure \
 		--target="${CHOST}" \
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 53a97dba1c85..783abc10adc3 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/evtest/Manifest b/app-misc/evtest/Manifest
index 4b22707865d1..bae5304c4d69 100644
--- a/app-misc/evtest/Manifest
+++ b/app-misc/evtest/Manifest
@@ -4,5 +4,5 @@ DIST evtest-1.34.tar.gz 19954 BLAKE2B 17ca600e89070d65f2bb95b468b921278ab63e50aa
 DIST evtest-evtest-1.35.tar.bz2 18686 BLAKE2B b2f747fab1f47c425133fc60697448972351e22d3ae606d3c548ead4e53f359eb1cebd2ec555afb678785670bddf3ff55d13b47f3160d4a49ff9ee496f041099 SHA512 d9ec506ad326af7749bdf9e92bf96af7eee29ef9ced645a12f99453019f6c072e2a84d67f59cc6014d27f0e4e53c3e517de1c5302b0789eaaf8ad9ca3c824282
 EBUILD evtest-1.33.ebuild 578 BLAKE2B edf2cd60d843f8bc9f928ba19a42c84343a18f58f9c9f2416b52fd64ce1f8dbd66e4e78dc7b76b4e45d1c7e403e2dae6e7b61860dbd29885ac3dc8ffc7cf42cc SHA512 b81257778c552857f5a629f6b4fef685ea1ca1ce945892c17dd0b14248f10bd30d0a89fee238670498d3c681725ded427bfa1af71ab3c5831f2f9bf62114aaac
 EBUILD evtest-1.34.ebuild 627 BLAKE2B 21345f979f6e05156b7cf3bffc715d64abd6e9e66a8ee9b40f14b5b1c888fcf1686094688867dd905db9e5f73c8fa5d10f42a060e374431e90e3bf00197a8dd9 SHA512 806c3c74e87b155948a56e3dbb14d9d71c02ee789fafd885c15db9dd64d1024e13fcbb3740ba4cabacca17190ba28aee43445f30d0ca1b85265a830329fa3a89
-EBUILD evtest-1.35.ebuild 651 BLAKE2B 074c46ae58ba81fccbbaeae409cf23187205f82081313923d1db20e95b5650e2ae79b61c172f4e12ee4c56fb61c3aa2fde35c97f94c593cc2e077e76c0158443 SHA512 961d2849b89e33d8252b8e692738d7adf6969c79fa036d4983d3af3692e17001efde9419110aea67d65dd34d8c0dd9408d9c0754258005149105babffdc4005e
+EBUILD evtest-1.35.ebuild 648 BLAKE2B a7bb9f4a5e90acc278aa557db4226d11edf9e6a0f3e2052bcbe22636a23f43dbb8249160581d266288e51a96213032994e028a808a48aa74a46f5c06cac1b2cf SHA512 60a2114c2a718f1e3af0a53ee9e60f198f1bf8bc391ced9548fd8dc914642b3a1c3429914c82ccf5a65b8f497a3fb052640ed1ecffd6ed1f90a7b0cd3fc00015
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/evtest/evtest-1.35.ebuild b/app-misc/evtest/evtest-1.35.ebuild
index 96ddf335b126..df1a1a628e45 100644
--- a/app-misc/evtest/evtest-1.35.ebuild
+++ b/app-misc/evtest/evtest-1.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
 BDEPEND="app-text/asciidoc
 	app-text/xmlto"
diff --git a/app-misc/liquidctl/Manifest b/app-misc/liquidctl/Manifest
index e0d83ec79d7a..ffed4ef1fbc4 100644
--- a/app-misc/liquidctl/Manifest
+++ b/app-misc/liquidctl/Manifest
@@ -1,5 +1,5 @@
 DIST liquidctl-1.11.1.tar.gz 1836371 BLAKE2B e302251855b48405d811287061df3593f0549f02d8d369ae0c0178c27722b69e3c589763de5a963e2b2a37d88f3213e649da9e6f74db59a36f9b803d33d2b038 SHA512 06c11eb0bb258ec4111e885d5ed2bf89842fc0a9bfbc57aee6c86d405808d9bd9582fa137beac7250949448454412d03ade0bc3ee16cd3bd8de3fff66a0cc1bf
-DIST liquidctl-1.12.0.tar.gz 1841834 BLAKE2B b3922a55db32234cf87914530beccbf58943fb66a9c71f94ed7135187035ad901da364fcab87dbfc8c57312d494e2daec7fabcfff6823b7b55fbb3b538db889b SHA512 6c55cd223e64a6f202dca0331fdb352c8402de859bd01b1eed1d9f3859fd9b6371393b2e365c642dd9a24e76adb5a1f6a9c0603214b3198c3c0ee4e7a8fafd39
+DIST liquidctl-1.12.1.tar.gz 1842721 BLAKE2B b3732d4192fef2a2dfcb8edd42a3fb0d5c2f9b32c43a8950561e302a122fe4c993338035d3b779929e625257f4f59576550bfbf8a334c1b1fbba868ed0abc562 SHA512 37e81f29516d051603fb50f9fd5e6b6646a02d2aea1dc1d4247b2286a9649f79b85c4d856ab5f1df04ae2f3eecc2ebc4f865e08b28be85c2915be9723854cf7a
 EBUILD liquidctl-1.11.1.ebuild 1190 BLAKE2B 7c8933ecd8a06f55556f3a1610bab603a02d5ec5134984ef421bf98adc94fa63f9a3627d7d8c55f95ab98388dff45d6fa03538fdcf48b0adb1e4928ace4fd758 SHA512 8401c21a6c2d69953e2383f4da829581861f18a87f99acd6af26d44140682c3f6f63b10ff27b95423ec20596b7e8a661aa128b48077ebdc558084b33bdedfd06
-EBUILD liquidctl-1.12.0.ebuild 1190 BLAKE2B 7c8933ecd8a06f55556f3a1610bab603a02d5ec5134984ef421bf98adc94fa63f9a3627d7d8c55f95ab98388dff45d6fa03538fdcf48b0adb1e4928ace4fd758 SHA512 8401c21a6c2d69953e2383f4da829581861f18a87f99acd6af26d44140682c3f6f63b10ff27b95423ec20596b7e8a661aa128b48077ebdc558084b33bdedfd06
+EBUILD liquidctl-1.12.1.ebuild 1190 BLAKE2B 4384ab9eec4259444cb1fa632b0a45de1474c39586825090b3d693b195a6a9433652564d3308c297cc033881a849950d9a9dc260d054afac00e14eeb972bd2bf SHA512 7c05bb184422453e886cf730914301b91a7c91d9f6a13030693b90999b89e6702d8f0d99b2a005711c4904e157d46100b4f8bcd73d851903e755ec21be9d792b
 MISC metadata.xml 393 BLAKE2B 4d17c054724b6a040f9c44be278098cc23cf7359ef231acb98fc6c4ab0fa4e1edb2e8e94cbffb30ed0d37eebd14e1dbfc3f58d6e90a710e50d8bdf3fcdb360b9 SHA512 bba692184dac4f282c174a6e2e7e60756c865b1a1dab50bc572f02ed4d1e16a77132368886b6c3aa9c44d0cae7c60d0268e20a2e33572e06d2a639f936be0099
diff --git a/app-misc/liquidctl/liquidctl-1.12.0.ebuild b/app-misc/liquidctl/liquidctl-1.12.1.ebuild
index 7efd2e56d181..446ab3f13df9 100644
--- a/app-misc/liquidctl/liquidctl-1.12.0.ebuild
+++ b/app-misc/liquidctl/liquidctl-1.12.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 udev
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 19f782882469..8bce0a13d1c1 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/pycargoebuild/Manifest b/app-portage/pycargoebuild/Manifest
index 0e74bd1f698c..9bc3203b285a 100644
--- a/app-portage/pycargoebuild/Manifest
+++ b/app-portage/pycargoebuild/Manifest
@@ -2,10 +2,12 @@ DIST pycargoebuild-0.5.1.gh.tar.gz 17587 BLAKE2B f5c35acc43cfcc1a844f9bf0f01b72c
 DIST pycargoebuild-0.5.2.gh.tar.gz 18304 BLAKE2B f9150ee2532b9683be9c504397f6c396956aefd285784ff156aaec5d8ab7cb9bb71643271463dd237c357dd6d061fe67cc5dd2470085cf1faf79b4c62d839135 SHA512 56099598a6b97929029e7cb8f3d67c81d187b2a9811e78de384ab37ec28aec8649bfe61ca987ace82fc18925d77ba19c7c6e89d8537f37ea65bb0127566a6c2f
 DIST pycargoebuild-0.5.3.gh.tar.gz 19180 BLAKE2B 56d93ca65abd68e0c3f0b715ae9811f8428a8de99ff7f2689e42da4c1dfe5f74526014e7a91232602fec8dce4f329359cdeafdf47e9a9004898a3c731003acd3 SHA512 038759d67e4c45542fa07b21aa9f2237457ccb4d74565e3a8e744b3a978c38d5cbf2d86c28acba53c08062ad70a7a2ef45659129855b7242257b8ca4d2d69111
 DIST pycargoebuild-0.5.4.gh.tar.gz 19641 BLAKE2B d515ebcd988c5c6c5668ce53c793bd76ca3ffbf5c72645a55ddbf25a3f97960a362f4a34ca9f09336b014b5e658ab7ca3f75fb8e7c951d2141a07f3ff1716d62 SHA512 50997066d3b9616a90df88bce058b301dae6060f68d8ae28c733f8de97b2577700b2624d15f386b844e878c70aa0de408eb71e724cdc8cc40fc610e3e9807d1e
+DIST pycargoebuild-0.6.1.gh.tar.gz 20233 BLAKE2B a680f0b446554797f82f5903b8f51631d4026329de79327c788338ddafecdcc47b7f1d0ca3b0c81a909cde6ba24eece576f3f591ea08ad1d7adf90d545ab0869 SHA512 00183b2cedddb0c47be3e709250e679184f45af16575a5b94efc5a1598379f5c02246fd303e26b7e53ebf858c039552c7802329b0ee62c67cc15c42b39c00f09
 DIST pycargoebuild-0.6.gh.tar.gz 20133 BLAKE2B ff583fe514380acec276c7cdbedff459bd0a1dc4ce568d022743f5f7301073009f6838b2d6be20815b1d2108bc34c6af1540fbf4f736c90d6b355f6ee0c6c712 SHA512 1a132f1c15dc1b984e1f941ffac8105719e9afd691256bac73a70f64a61e35595eff36a56a6ad67462af30ab8ed043959513491e8c5f45448f79ba8ea1d787d2
 EBUILD pycargoebuild-0.5.1.ebuild 674 BLAKE2B c006e62e932db3d580c335815479dad7465805b36ef04e5f0e27acc20bb1b225142720f8e7842b2251868d1d171e55ff64c039786bf008fe2a85ec0c4090133e SHA512 d95db3cbf43a6b4f931044f8dcdf94cc4e5e3151064126a045956a2ceb887b30b2f90be47bf3d97370936f429a10392fc3a1da0b99fa42013dfdb7bc24bb90b0
 EBUILD pycargoebuild-0.5.2.ebuild 674 BLAKE2B c006e62e932db3d580c335815479dad7465805b36ef04e5f0e27acc20bb1b225142720f8e7842b2251868d1d171e55ff64c039786bf008fe2a85ec0c4090133e SHA512 d95db3cbf43a6b4f931044f8dcdf94cc4e5e3151064126a045956a2ceb887b30b2f90be47bf3d97370936f429a10392fc3a1da0b99fa42013dfdb7bc24bb90b0
 EBUILD pycargoebuild-0.5.3.ebuild 674 BLAKE2B c006e62e932db3d580c335815479dad7465805b36ef04e5f0e27acc20bb1b225142720f8e7842b2251868d1d171e55ff64c039786bf008fe2a85ec0c4090133e SHA512 d95db3cbf43a6b4f931044f8dcdf94cc4e5e3151064126a045956a2ceb887b30b2f90be47bf3d97370936f429a10392fc3a1da0b99fa42013dfdb7bc24bb90b0
 EBUILD pycargoebuild-0.5.4.ebuild 674 BLAKE2B c006e62e932db3d580c335815479dad7465805b36ef04e5f0e27acc20bb1b225142720f8e7842b2251868d1d171e55ff64c039786bf008fe2a85ec0c4090133e SHA512 d95db3cbf43a6b4f931044f8dcdf94cc4e5e3151064126a045956a2ceb887b30b2f90be47bf3d97370936f429a10392fc3a1da0b99fa42013dfdb7bc24bb90b0
+EBUILD pycargoebuild-0.6.1.ebuild 674 BLAKE2B c006e62e932db3d580c335815479dad7465805b36ef04e5f0e27acc20bb1b225142720f8e7842b2251868d1d171e55ff64c039786bf008fe2a85ec0c4090133e SHA512 d95db3cbf43a6b4f931044f8dcdf94cc4e5e3151064126a045956a2ceb887b30b2f90be47bf3d97370936f429a10392fc3a1da0b99fa42013dfdb7bc24bb90b0
 EBUILD pycargoebuild-0.6.ebuild 674 BLAKE2B c006e62e932db3d580c335815479dad7465805b36ef04e5f0e27acc20bb1b225142720f8e7842b2251868d1d171e55ff64c039786bf008fe2a85ec0c4090133e SHA512 d95db3cbf43a6b4f931044f8dcdf94cc4e5e3151064126a045956a2ceb887b30b2f90be47bf3d97370936f429a10392fc3a1da0b99fa42013dfdb7bc24bb90b0
 MISC metadata.xml 384 BLAKE2B a5c91cf81989cb7f2ff504cd9931e89cb85a2b17721818efbc436d13e68d673c4f384839c67eeec8fe24c1a78b112c3fe37ee1722d2d28f44c5a075ec8fe18ba SHA512 76ffa916e9630225aadb9a0d2073087fcb848b782f6e44c28c354533c5329ed337e609666ee7eba90ef1191be2a34e968d3bc06556cfafce32a43a22100cc6f0
diff --git a/app-portage/pycargoebuild/pycargoebuild-0.6.1.ebuild b/app-portage/pycargoebuild/pycargoebuild-0.6.1.ebuild
new file mode 100644
index 000000000000..509b3840a625
--- /dev/null
+++ b/app-portage/pycargoebuild/pycargoebuild-0.6.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A generator for Rust/Cargo ebuilds written in Python"
+HOMEPAGE="
+	https://github.com/projg2/pycargoebuild/
+	https://pypi.org/project/pycargoebuild/
+"
+SRC_URI="
+	https://github.com/projg2/pycargoebuild/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/license-expression[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index d1505abc4821..5b0ef502eb53 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 1ecabff39643..201950f88126 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -3,6 +3,6 @@ DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a1079581
 DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a
 DIST gprbuild-23.0.0.tar.gz 952887 BLAKE2B a0de49e838dd41ca927d728dc2e7f23298bb3e7f865146ed6807e1da0f20fe9ce345d972ef93340f1a1fec91082ce14b575ad4e6642d759cb9d696602f291508 SHA512 d3b1af5295c0216eaa93e52b63ca51ceeaea324a3a3f40644e294f9048170f9294335e7e8ee2d77d99d4d9bb359267921632a01d43485d841b6e771143fb47a5
 EBUILD libgpr-2021.ebuild 1488 BLAKE2B 7c42a8634ccdf0ede450d9da5ea13cd3481679622970e55bfe9df22b1337133b77246df3761532f471ebc2afd094ffb5fd8bbcfdf0e457e30539d6f77df42953 SHA512 ae0870be62f04087987534045e327e06f8bdf12b708d32d91d537b124283ab02d476581021d086f91e39f1c08e65c17f0c2e11920bcf140a887b1d3c791eeba9
-EBUILD libgpr-22.0.0-r1.ebuild 1506 BLAKE2B 0ac889f56cb25111a3d58e1ece5b493bcf31fb3faaa6b0ad17bd6d7918ab4f166ed19fb552f57dc04ca8f7823251a2e4cd96973f2082c55ba0c8b9a387beae35 SHA512 a90e8d82e6fe71eedd41bb76e0c70a64953948aa099a1792bedf3e4fc4f0582f10668d1ab06dcf59a2268fe8d9053a5b12bbc1099f0e4a2f0b96932e2181fbc7
-EBUILD libgpr-23.0.0.ebuild 1506 BLAKE2B 0ac889f56cb25111a3d58e1ece5b493bcf31fb3faaa6b0ad17bd6d7918ab4f166ed19fb552f57dc04ca8f7823251a2e4cd96973f2082c55ba0c8b9a387beae35 SHA512 a90e8d82e6fe71eedd41bb76e0c70a64953948aa099a1792bedf3e4fc4f0582f10668d1ab06dcf59a2268fe8d9053a5b12bbc1099f0e4a2f0b96932e2181fbc7
+EBUILD libgpr-22.0.0-r1.ebuild 1504 BLAKE2B a229f3c7ce451cf24947e06890de4639684a61a5dac10a08961cc3f44da9b1959f2add75618f1740ed1e543e9098bf91b17f6dd43c838d76f00bc3c7748b1f00 SHA512 f38fb8515c9dbe6b65d94eff2224705c241edb8d081944bc2188f060ec395413349c4986f38e2d655c836840805c1c5cb352b92c78b594f8ef6b0e2c372ff232
+EBUILD libgpr-23.0.0.ebuild 1504 BLAKE2B a229f3c7ce451cf24947e06890de4639684a61a5dac10a08961cc3f44da9b1959f2add75618f1740ed1e543e9098bf91b17f6dd43c838d76f00bc3c7748b1f00 SHA512 f38fb8515c9dbe6b65d94eff2224705c241edb8d081944bc2188f060ec395413349c4986f38e2d655c836840805c1c5cb352b92c78b594f8ef6b0e2c372ff232
 MISC metadata.xml 1021 BLAKE2B 448e77605bee95104afac31b48193217ee6c38af0b4e63cdee2c5d8e420a7f9b9a13c1302cfe49a109ab5c878808582a6f4a3ca3315e41b256f529d202bc1b4b SHA512 71427b65c100cba3e66d889124f27f1e378ad72559e7165ec93a4ffc68b7efe12db81ee5ec83aa92939b922d3efcfb3a5641c46db772a25bae21ce51acec5f47
diff --git a/dev-ada/libgpr/libgpr-22.0.0-r1.ebuild b/dev-ada/libgpr/libgpr-22.0.0-r1.ebuild
index 6fcb61de1f14..9e4923a635c3 100644
--- a/dev-ada/libgpr/libgpr-22.0.0-r1.ebuild
+++ b/dev-ada/libgpr/libgpr-22.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/AdaCore/${MYPN}/archive/refs/tags/v${PV}.tar.gz
 		-> ${MYP}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="dev-ada/xmlada:=[shared?,static-libs?,static-pic?,${ADA_USEDEP}]"
diff --git a/dev-ada/libgpr/libgpr-23.0.0.ebuild b/dev-ada/libgpr/libgpr-23.0.0.ebuild
index 6fcb61de1f14..9e4923a635c3 100644
--- a/dev-ada/libgpr/libgpr-23.0.0.ebuild
+++ b/dev-ada/libgpr/libgpr-23.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/AdaCore/${MYPN}/archive/refs/tags/v${PV}.tar.gz
 		-> ${MYP}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="dev-ada/xmlada:=[shared?,static-libs?,static-pic?,${ADA_USEDEP}]"
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index db0da55edc53..42a6993c01a6 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,10 +1,7 @@
 AUX xmlada-2019-gentoo.patch 1053 BLAKE2B 33403adf7bf4f774d7fbcf9f07fe0d248a0c7e54df1d4620231813519932b91522c6d17f4f1774b84f48975cb5ca1e14cb01e87607da86df5a005b6766c9b1ff SHA512 0cdd0e9ff1cafcacaaeadb541ab0fa6a783dfd4b2d51528d18eeb99fdcba4a0a1f005c6210d5ac6b0c3052eb67e777f5e481d7fd8ef723d93be1561fba2afe26
 AUX xmlada-23.0.0-gentoo.patch 1070 BLAKE2B 1894bf507add813229dc505c6300d475dfbad4a5f0dbcf957b211cf47f9f916d5656658eecd4892d10810d4e5c13cda00107d7a9fe591ebe8f4b5b3567a043c9 SHA512 c3fd4ee0d44df3ad836c6ca3a1e1ae3ee0c5962c8a628299134e6293bc8bdb0de3b98b43910940646c4384db985cf4a1fb47b50ac17a2d315bb1ee12a406e800
-DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
 DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e
 DIST xmlada-23.0.0.tar.gz 1053370 BLAKE2B 4edf2244818d72d6fc760f60c8145f373e5445d1d245b20b605e21faa7eeefed7835db87c1fd1239008e75211a572294e1d8e35af16c2ba2631c02d1d3b6f52f SHA512 a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb
-EBUILD xmlada-2021-r1.ebuild 1974 BLAKE2B 6c6c772a9cb25e1759391ce67d3ee415f632604e958c413b09894778306c767a70239e587ddc7b94da82b3d11ebcd21545fb66c4c581b03bd26010d3afdfb6a6 SHA512 ab639cc9e0c73fb2f8d7a82d444af3783c8f965319addb9005f7298876b305feb3494c5c73938e805418242540cecc5aa89966623c19115718c3cffbd3c167ee
-EBUILD xmlada-2021-r2.ebuild 2678 BLAKE2B c165bf34cf9089a9d731d5c205b82b3012266359efaf0d6f282cca7d45722d15f556ae86d0b6138230858b98afab26508112db02794a7c8adbfa4d3f77866f52 SHA512 d3ac7ba1f9fa75e966ddb91fa12e0081d0710ecbae0b7ae3b99a8dec2323173619978081f8d70d78633ccbedab161e5be46b7ac955f3e1e82ce09deee4007ce4
-EBUILD xmlada-22.0.0.ebuild 2435 BLAKE2B ef32fb66a7f88b2e5cb33d414328fe8c3bae75f42a028e322d0a4b76ebf751031bc20f6ab8d2f3647b9334b91b0582fd501832cb45b785698587e53425d19feb SHA512 3f616978b7fe153e50c25459c405bb3fde90edd9a15c0e0e5c8d3d0f315cdece17f7c049047a2f21846f2b82dd42482934e9fb860bacf26e86ef3eb2ad3d4639
-EBUILD xmlada-23.0.0.ebuild 2655 BLAKE2B 95498c3adfb110fd7af5c54e6f4b3abd30385a49686ec86cd2f2ebfab224b5005eb930597b51dfdfcce031609b7caa37330dfffce01b2b1735a24bfe6e2e73f4 SHA512 88cad5b00309e350035766ecdad76e63e7d6c5ba8f33c7b4ebb5ad3c63bf352f25567339ea91730ad9c9a4387d012c1e7c4cb5387e054b1e3bc90f5bbf639d8f
+EBUILD xmlada-22.0.0.ebuild 2433 BLAKE2B ee1041766729f73519c8c08e03fb34b616c49f3367c960f0218a2ed37cf07f89f9eb351ebd3c7792d8f4e43d8d225b6eff7740602a4200804215e125181ff0bd SHA512 b61d42153b29c2e2d48bb16ce623ae29aaaedd5c5845db9742a7a7d303406092b84875c214b6a0adaf122a348629c9486466efb0a18dcd9c632094dd251e4c74
+EBUILD xmlada-23.0.0.ebuild 2653 BLAKE2B b673062ea444caaa352f61ff6d07a3d48a9314633a6fab02bd85514aa07fd5ed7499aef8c2be26dc0993278452c9d247e6e11df40567764318ad2d70c0f2ba83 SHA512 ed47aa71f0ff42bc96fff577420daf39c9d464b170544a8370341bb5b144da2088af4f517383b7555872f338bed856497723a785de9b26de87ebf955d079d781
 MISC metadata.xml 987 BLAKE2B 0cea4d25986c676a4418a482ece808fe48869771b7c021727b7b81785ae254d68eab90a6ba52e5a62b2fbf2ea2539103cfc4b4909ebc6c578c33d61d8b3bb16e SHA512 c578017e1aceb4e81669eb3a44cb7e154f5ef16e09b88de70c5fb4675619fbbbaa0260ad7e7ba7bf07a957e64ac9ee8dc172d91df9f8ee1801ff5e4787e09092
diff --git a/dev-ada/xmlada/xmlada-2021-r1.ebuild b/dev-ada/xmlada/xmlada-2021-r1.ebuild
deleted file mode 100644
index e39fcd732fd4..000000000000
--- a/dev-ada/xmlada/xmlada-2021-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2021 )
-inherit ada multiprocessing
-
-MYP=${P}-${PV}0518-19D50-src
-ID=6a2cf72f308cc787926b12ddc20993fcf2b8ea79
-ADAMIRROR=https://community.download.adacore.com/v1
-
-DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2019-gentoo.patch )
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-			-largs ${LDFLAGS} \
-			-cargs ${ADAFLAGS} || die "gprbuild failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_test() {
-	emake test
-	emake run_test | tee xmlada.testLog
-	grep -q DIFF xmlada.testLog && die
-}
-
-src_install() {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
-			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
-			--install-name=xmlada --build-var=LIBRARY_TYPE \
-			--build-var=XMLADA_BUILD \
-			--build-name=$1 xmlada.gpr || die "gprinstall failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-
-	einstalldocs
-	rm -f "${D}"/usr/share/doc/${PN}/.buildinfo
-	dodoc xmlada-roadmap.txt
-	rm -rf "${D}"/usr/share/gpr/manifests
-	dodir /usr/share/gnatdoc
-	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/gnatdoc/ || die
-	mv "${D}"/usr/share/examples/xmlada "${D}"/usr/share/doc/"${PF}"/examples || die
-}
diff --git a/dev-ada/xmlada/xmlada-2021-r2.ebuild b/dev-ada/xmlada/xmlada-2021-r2.ebuild
deleted file mode 100644
index d4925f5ba896..000000000000
--- a/dev-ada/xmlada/xmlada-2021-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2021 )
-inherit ada multiprocessing
-
-MYP=${P}-${PV}0518-19D50-src
-ID=6a2cf72f308cc787926b12ddc20993fcf2b8ea79
-ADAMIRROR=https://community.download.adacore.com/v1
-
-DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2019-gentoo.patch )
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-			-largs ${LDFLAGS} \
-			-cargs ${ADAFLAGS} || die "gprbuild failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_test() {
-	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
-	gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=static \
-		-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-		-XTESTS_ACTIVATED=Only \
-		-largs ${LDFLAGS} \
-		-cargs ${ADAFLAGS} || die "gprbuild failed"
-	emake --no-print-directory -C tests tests | tee xmlada.testLog
-	grep -q DIFF xmlada.testLog && die
-}
-
-src_install() {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
-			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
-			--install-name=xmlada --build-var=LIBRARY_TYPE \
-			--build-var=XMLADA_BUILD \
-			--build-name=$1 xmlada.gpr || die "gprinstall failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-
-	einstalldocs
-	rm -f "${D}"/usr/share/doc/${PN}/.buildinfo
-	dodoc xmlada-roadmap.txt
-	rm -rf "${D}"/usr/share/gpr/manifests
-	dodir /usr/share/gnatdoc
-	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/gnatdoc/ || die
-	rm -f "${D}"/usr/share/examples/xmlada/*/b__*
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.adb.std*
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.ali
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.bexch
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.o
-	rm -f "${D}"/usr/share/examples/xmlada/*/*example
-	rm -f "${D}"/usr/share/examples/xmlada/dom/domexample2
-	rm -f "${D}"/usr/share/examples/xmlada/sax/saxexample_main
-	mv "${D}"/usr/share/examples/xmlada "${D}"/usr/share/doc/"${PF}"/examples || die
-}
diff --git a/dev-ada/xmlada/xmlada-22.0.0.ebuild b/dev-ada/xmlada/xmlada-22.0.0.ebuild
index 21d209e6354d..91c12a5c5d1e 100644
--- a/dev-ada/xmlada/xmlada-22.0.0.ebuild
+++ b/dev-ada/xmlada/xmlada-22.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"
diff --git a/dev-ada/xmlada/xmlada-23.0.0.ebuild b/dev-ada/xmlada/xmlada-23.0.0.ebuild
index 72b36a303116..60a27cd43583 100644
--- a/dev-ada/xmlada/xmlada-23.0.0.ebuild
+++ b/dev-ada/xmlada/xmlada-23.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index c7595edd7bf8..0d117574dc76 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/recastnavigation/Manifest b/dev-games/recastnavigation/Manifest
index 2ac629ce1aed..9e13f8a89ef6 100644
--- a/dev-games/recastnavigation/Manifest
+++ b/dev-games/recastnavigation/Manifest
@@ -1,3 +1,6 @@
+AUX recastnavigation-1.5.1_p20230102-catch.patch 370 BLAKE2B f8f58742fe01770b432741cd593fc057b42e293494ab08efd5a93ab7220e2a18bd52e9965fcc23f301abebf58f89a858e8d541d894c07625751c71349cb25bf4 SHA512 7a052928b13fb09415dff6333a7bff0cd2fe8c93b7ef1383ec36e2d4a7d25f226a2ecbfa7400755c95f75dd463f64dcda4a2fd8b991732e4bd3975a11bbe1d0e
 DIST recastnavigation-1.5.1_p20210305.tar.gz 1542880 BLAKE2B f1066a48c7269fe67deba17768187522db9c0ece11293a3ff54311a6400cd38f32340985729bb38109bc1262099b44b7bf92974dfeb80c47953e58e6eeab73ea SHA512 7c3a8ce3e38de81eeb31332584896af9f234826c7f7f831eccb36972746c8b528ffde7ae4ee0d25baf814ece030a4b029101e07ea89aacc33c6d44f1ae2cf265
+DIST recastnavigation-1.5.1_p20230102.tar.gz 1276864 BLAKE2B 0958fd76c1855dee0d4d4ee8b0e31cfac3c1bdee1f5f767c4dec0bec75b3c919760d9201ba27d772602200e9416e08955b7ef326603ec21fb9594f2d40c079bc SHA512 4820e473735b08920bca7032851b258e8748c093bae331b11c0c9f630e9973264d9ca6277f7d92818b0a8c0864ce2601f129b708ec7976c9baead88d7b844f76
 EBUILD recastnavigation-1.5.1_p20210305.ebuild 883 BLAKE2B 923a020bf25470dc0255f54ec3d94d9377770a6f6a980c83fa052ba2cb6a0d66cbaad9776b162b4259ebd3f36a3b09c09fba1bc9900d0fc3bd7cdb35c81b24d6 SHA512 042ff545ad90fde39182ee24cd99852b2a71ff800fc780d6ecb269a2b872b4354f6bfb8286b190987cbf13336aa9fe567291817e45688845ca0e8e186436ed5a
+EBUILD recastnavigation-1.5.1_p20230102.ebuild 961 BLAKE2B 67762fbdc910e5a45da7cd553d4237f1639599c91fc739bd4ca636ee7d1fe92d2d122efcc61204f0e78c22d5710388d09ea585341fe5ae4d2b196d7027c76819 SHA512 d478677ca1b01d0cceab08b6dba664fd574a3291c2242ad0fdeae1064e815ce1cd2d3fe397c1c59904d9fe505207d69eb27406b25cd0f4b5922592e2fbd1e548
 MISC metadata.xml 518 BLAKE2B fba57dea48cf34834a98d45b6562b2a736357e0cde55c389a6d77c843eacfd11afea73f0e11d34997f4f8c7476f8c4c1bf3b73b287462e104eb9bd98ae152573 SHA512 5c75aea0977d0f4f2c1bea36a17ed12531d6537f6b4d597928eed3ac244a02ad17bbe07f45dbc43a737b32bcdfbf91cfa035fcff1e5231cb987802a11aed9bae
diff --git a/dev-games/recastnavigation/files/recastnavigation-1.5.1_p20230102-catch.patch b/dev-games/recastnavigation/files/recastnavigation-1.5.1_p20230102-catch.patch
new file mode 100644
index 000000000000..5b0ff9bc6017
--- /dev/null
+++ b/dev-games/recastnavigation/files/recastnavigation-1.5.1_p20230102-catch.patch
@@ -0,0 +1,10 @@
+--- a/Tests/CMakeLists.txt
++++ b/Tests/CMakeLists.txt
+@@ -10,5 +10,6 @@ add_executable(Tests ${TESTS_SOURCES})
+ set_property(TARGET Tests PROPERTY CXX_STANDARD 17)
+ 
+ add_dependencies(Tests Recast Detour)
+-target_link_libraries(Tests Recast Detour)
++find_package(Catch2 REQUIRED)
++target_link_libraries(Tests Recast Detour Catch2::Catch2WithMain)
+ add_test(Tests Tests)
diff --git a/dev-games/recastnavigation/recastnavigation-1.5.1_p20230102.ebuild b/dev-games/recastnavigation/recastnavigation-1.5.1_p20230102.ebuild
new file mode 100644
index 000000000000..d62785277e49
--- /dev/null
+++ b/dev-games/recastnavigation/recastnavigation-1.5.1_p20230102.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Navigation mesh construction toolset for games"
+HOMEPAGE="https://github.com/recastnavigation/recastnavigation"
+MY_COMMIT="405cc095ab3a2df976a298421974a2af83843baf"
+SRC_URI="https://github.com/recastnavigation/recastnavigation/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="ZLIB"
+SLOT="0/1.5.1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/catch:0 )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-catch.patch"
+)
+
+src_prepare() {
+	rm Tests/Contrib/Catch/* || die
+	echo "#include <catch2/catch_all.hpp>" > Tests/Contrib/Catch/catch_amalgamated.hpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DRECASTNAVIGATION_DEMO=OFF
+		-DRECASTNAVIGATION_EXAMPLES=OFF
+		-DRECASTNAVIGATION_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 0d4303db1fbc..e2572a2b4cd3 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 31be0a21701d..53ca2eb33446 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -4,5 +4,4 @@ DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed
 EBUILD protobuf-java-3.21.12.ebuild 4455 BLAKE2B da8ac403b4db3b9b24b52b797c14e0a0e08a36f10e5dc06a3ef7fe82457e5d0e3df815c701e452257aff7f8ee12d648cfc19c54794d74a53ed7098edb6476012 SHA512 9c0c98c0de93c5d7425c75907bf3c51d968df50fb31cbabeb2733112f76e5341294f2700f7c9cbc9daf006a469448af583c2cbb87ce99e0f5b01d2421d2eaf7d
 EBUILD protobuf-java-3.21.9-r1.ebuild 2998 BLAKE2B ccc295705b54c9d132c5d67a5a949fa3cbc9d0ee330540d9824c5e36dc738e70080fdb66a941f225748df62af934b30c2745f01b06436eb6c3e921c04e6c1dcb SHA512 7d11c96dfa448ae46ebab6ddcc0dc622cd8bbc04090354148eaf2d89f6f9d3f31b7b49eae7506e70dc0f78bde3bf4ddf74cdba214a663d47cdaa1466168b0e72
 EBUILD protobuf-java-3.21.9-r2.ebuild 4309 BLAKE2B 0d836a8bd93a282e57702ae646eff00983d3f1e037a9bd9267e0a3167c632bf254b83339379b77746d5c11564d8db9827a810623df57aa2a893e8c5e1c25c203 SHA512 73b895c8e096ae863dfc56c948649701721690fa13ba51d15cdfc31a14f4034a82653069caa1d77749f1da4e6e637ac6306bd7157c128bb608cded3dbdf8a448
-EBUILD protobuf-java-9999.ebuild 3078 BLAKE2B 837383cde2c29c4605564b30a071eeb8240c9a447a03cae8c63526d0c0011146faf0a914fe13c0cfe6952f49fef01c08e928fb7568a1f7930393ae851a87f484 SHA512 4be8eef3afd89a5e0248d4181d0ae7e1fdde18adfa9e7e3e9aa869e174adff77ce066ae346393d201ba585c7dd686b7ee0826ba9f76729f11569717b5655441c
 MISC metadata.xml 625 BLAKE2B 13394b9a2148b9117ce719954591e79088f845ac1ceb667bbdd2645b989daadcfea09525f9dde68c405e3f1cce5cc1af32de9fb4dff629e4745e13fa92727dd7 SHA512 47f693db57dbde04f419ed65494d81b0a800c9ac49d790c9b794baef34fb1f876da29c5a0662c45aa3c01cecd34af648e196fb76110fcc0066198c59543049b3
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
deleted file mode 100644
index f269a7bc8533..000000000000
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2008-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-# Version based on value in (java/)core/pom.xml from main branch
-# Please update me when new release
-# Maybe find a way to automatically change it?
-MAVEN_ID="com.google.protobuf:${PN}:3.21.7"
-# Tests not enabled, depend on com.google.truth which is not packaged
-# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L35-L40
-# JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit edo java-pkg-2 java-pkg-simple
-
-PARENT_PN="${PN/-java/}"
-PARENT_PV="${PV}"
-PARENT_P="${PARENT_PN}-${PARENT_PV}"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
-else
-	SRC_URI="
-		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
-			-> ${PARENT_P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="
-	https://developers.google.com/protocol-buffers/
-"
-
-LICENSE="BSD"
-SLOT="0/32"
-
-S="${WORKDIR}/${PARENT_P}/java"
-
-BDEPEND="
-	dev-libs/protobuf:${SLOT}
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava:0
-		dev-java/mockito:4
-	)
-"
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
-JAVA_JAR_FILENAME="protobuf.jar"
-JAVA_RESOURCE_DIRS="core/src/main/resources"
-JAVA_SRC_DIR="core/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
-JAVA_TEST_RESOURCE_DIRS="../src"
-JAVA_TEST_SRC_DIR="core/src/test/java"
-
-# Same than PATCHES but from repository's root directory,
-# please see function `src_prepare` below.
-# Simplier for users IMHO.
-PARENT_PATCHES=(
-)
-
-# Here for patches within "java/" subdirectory.
-PATCHES=(
-)
-
-src_prepare() {
-	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
-	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
-	eapply_user
-	popd > /dev/null || die
-
-	# Remove bundled jars
-	java-pkg_clean
-
-	java-pkg-2_src_prepare
-
-	# There is also compiler/plugin, but not in this list because in a subdirectory
-	core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
-
-	# Copy resources from ../src/google/protobuf according to
-	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L45-L61
-	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
-	local core_proto
-	for core_proto in "${core_protos[@]}"; do
-		cp "../src/google/protobuf/${core_proto}.proto" \
-		   "${JAVA_RESOURCE_DIRS}/google/protobuf" \
-			|| die
-	done
-	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
-
-	# Generate 146 .java files according to
-	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/generate-sources-build.xml
-	for core_proto in "${core_protos[@]}" compiler/plugin; do
-		edo "${BROOT}/usr/bin/protoc" \
-			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${core_proto}".proto
-	done
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 315fdaccc171..42360ee3a5fe 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 71e22f132c18..a77e84fe040f 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,6 +1,6 @@
 AUX zig-0.10.0-avoid-cmake-bug.patch 2200 BLAKE2B 6c06d318f2da258f3c003c5d8eaf66261ec736cb4ea0a87f3b0ff3d7c350bd51523ba2f23ea2bccbaed237fe76dfd6e1b56b1741a5ac6ba3539f7551e2347f70 SHA512 8e5ff85b26fe3f5a19e73aa9ad8d9f6446f936e3c2157b50212218a77747913e1199c0b52181e884755a90dfa839b23f305da82edeba6e8d3ceaff1d20a16efd
-AUX zig-0.10.0-build-dir-install-stage3.patch 927 BLAKE2B 6bf6797f04e3ad26ce9de0bf5fc388376e5ac3e5ebdf44a83ae882ba20cb3582ac10d40058ac13bec76766c6a1cd12021fde482379064ad7e9fa69981c013463 SHA512 4412f215b438409d0535f9c1668cd76bcbf2096a803a57048b301243ef4b183417339c8119d478d7eedea0ceaa0e520324cf3d40dd1f9ff5d6693c2fedd2f8c9
+AUX zig-0.10.0-build-dir-install-stage3.patch 1430 BLAKE2B cca909207cadfe1c9b31b9481a705882506363aaf41db7672f42cc66937f85f7b2f2b53346d29a4d748d1aef05e77efcc6e668ac498a7d172a6d8654034d5c4a SHA512 6704adb1f146ed78c8030aad2c739e30d0ec7ffda40273b5520914b16cc67d497afd9b1b59a1acfbb0097d7f5b0a5517973c45ef43ccbc35d8af051500577117
 DIST zig-0.10.0.tar.xz 14530912 BLAKE2B 5949a44ee039b7d5a163344a0fc26af8dd9cf311ed25c7092a665bb59ec7dec8dc3cd39918d81ef02c707aa8989b038fb21dfba3927fd31153a1404739b4ea3c SHA512 9d83ce51cc0ce404c06da820179c1cc47aa50e573fb1c831a96baa12c6b5226abe85b384110f2ffc4cbdc5f24eaba1f14a4e3249ffeaa248c0d73ba29859e682
-EBUILD zig-0.10.0.ebuild 3894 BLAKE2B b8a91fcd746edad38c6f60e724ffa50dbbcc0b64281c0f1159abdef183528c570fb4b5375841bd67d7f1b876536d4a8a4832ebcc470f3d2bb0d5d280719eea83 SHA512 9bee415a98467aff89dce760ec93a96edee7f766b4d75e916095b1c62a18b18443f2cbcac66240db0a3a7db5d2207db16804091dd05c866a1e4b06acf19670c8
+EBUILD zig-0.10.0-r1.ebuild 3295 BLAKE2B 0997f58541abc6687278dd7eec16944a16b90bd58dc5a4ededea12dbfe9006264fc087c937eb5d1a4579d016df222a5aa8ed721fe42124a0fc85984fe7b38ec3 SHA512 ea1dec43578750945a3401ca1a2cefce0be9bc8da06a65c0e6da2684be6be0ff41b315f110a9ec9f8af99298c16b7369a37c21027ee1f53e82ecaceee13dce56
 EBUILD zig-9999.ebuild 1671 BLAKE2B b753bbd37c7f1f60bdb2bc8fe3914d21f5b30787768460b55bd9e1980dc4727eb4f71c63a03da17a8a98c681df5e33e311b48c9c42fde8ab1b43a3bc9b3f4f90 SHA512 2b4d5a8fdfe5eba60896915b81168d5eb0aa3bcf53d6df8326c593f275556cf8652c401f0780f977325e877d36aa9348a196168f3e2c3dc3af99a8f5a1b46301
 MISC metadata.xml 541 BLAKE2B 6f5c7fbf759f0430f69073a17a0dae4b8bebf335b54c3b43da6b24104dc3de05a3b686cddbbd31e4dae1fc31695a2f08d000d22437ed6f1847de8fa95e3b1952 SHA512 d49cf0a8ad76ac9a6f6fb091effddbbcd812b56f91df6d3c782e15197cb4ff4423fb1076671a232aabcb9833af19ef8c820ad6df312a1e4d72e665680314c083
diff --git a/dev-lang/zig/files/zig-0.10.0-build-dir-install-stage3.patch b/dev-lang/zig/files/zig-0.10.0-build-dir-install-stage3.patch
index c44632f5111e..5704e4ba7921 100644
--- a/dev-lang/zig/files/zig-0.10.0-build-dir-install-stage3.patch
+++ b/dev-lang/zig/files/zig-0.10.0-build-dir-install-stage3.patch
@@ -1,18 +1,32 @@
 From: Eric Joldasov <bratishkaerik@getgoogleoff.me>
 
 Install 'zig' binary in 'build_dir/stage3' directory so that we can find it and use for testing.
+Also split "add_custom_target(stage3 ALL" and command that it invokes, so that it won't retry it during installation,
+as target will be considered not out-of-date. (Bug https://bugs.gentoo.org/890457 and https://bugs.gentoo.org/890459).
 Upstream PR https://github.com/ziglang/zig/pull/14255.
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1094,7 +1094,7 @@ set(ZIG_BUILD_ARGS
+@@ -1094,10 +1094,14 @@ set(ZIG_BUILD_ARGS
  )
  
  add_custom_target(stage3 ALL
 -    COMMAND zig2 build compile ${ZIG_BUILD_ARGS}
-+    COMMAND zig2 build --prefix "${CMAKE_BINARY_DIR}/stage3" ${ZIG_BUILD_ARGS}
-     DEPENDS zig2
-     COMMENT STATUS "Building stage3"
-     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+-    DEPENDS zig2
+-    COMMENT STATUS "Building stage3"
+-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
++  DEPENDS "${CMAKE_BINARY_DIR}/stage3/bin/zig"
++)
++
++add_custom_command(
++  OUTPUT "${CMAKE_BINARY_DIR}/stage3/bin/zig"
++  COMMAND zig2 build --prefix "${CMAKE_BINARY_DIR}/stage3" ${ZIG_BUILD_ARGS}
++  COMMENT STATUS "Building stage3"
++  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+ )
+ 
+ install(CODE "set(ZIG_EXECUTABLE \"${ZIG_EXECUTABLE}\")")
+
 --- a/build.zig
 +++ b/build.zig
 @@ -148,10 +148,6 @@ pub fn build(b: *Builder) !void {
diff --git a/dev-lang/zig/zig-0.10.0.ebuild b/dev-lang/zig/zig-0.10.0-r1.ebuild
index f47f22799167..4d9a45ee5fb0 100644
--- a/dev-lang/zig/zig-0.10.0.ebuild
+++ b/dev-lang/zig/zig-0.10.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LLVM_MAX_SLOT=15
-inherit cmake llvm check-reqs
+inherit edo cmake llvm check-reqs
 
 DESCRIPTION="A robust, optimal, and maintainable programming language"
 HOMEPAGE="https://ziglang.org/"
@@ -76,22 +76,17 @@ src_configure() {
 
 src_test() {
 	cd "${BUILD_DIR}" || die
-	local ZIG_TESTARGS=("-Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true -Drelease -Dtarget=native")
-	./stage3/bin/zig build test-cases ${ZIG_TESTARGS[@]} || die
-	./stage3/bin/zig build test-fmt ${ZIG_TESTARGS[@]} || die
-	./stage3/bin/zig build test-behavior ${ZIG_TESTARGS[@]} || die
-	./stage3/bin/zig build test-compiler-rt ${ZIG_TESTARGS[@]} || die
-	./stage3/bin/zig build test-universal-libc ${ZIG_TESTARGS[@]} || die
-	./stage3/bin/zig build test-compare-output ${ZIG_TESTARGS[@]} || die
-	./stage3/bin/zig build test-standalone ${ZIG_TESTARGS[@]} || die
-	./stage3/bin/zig build test-c-abi ${ZIG_TESTARGS[@]} || die
-	./stage3/bin/zig build test-link ${ZIG_TESTARGS[@]} || die
-	./stage3/bin/zig build test-stack-traces ${ZIG_TESTARGS[@]} || die
-	./stage3/bin/zig build test-cli ${ZIG_TESTARGS[@]} || die
-	./stage3/bin/zig build test-asm-link ${ZIG_TESTARGS[@]} || die
-	./stage3/bin/zig build test-translate-c ${ZIG_TESTARGS[@]} || die
-	./stage3/bin/zig build test-run-translated-c ${ZIG_TESTARGS[@]} || die
-	./stage3/bin/zig build test-std ${ZIG_TESTARGS[@]} || die
+	local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true -Drelease -Dtarget=native"
+	local ZIG_TEST_STEPS=(
+		test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
+		test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
+		test-run-translated-c test-std
+	)
+
+	local step
+	for step in "${ZIG_TEST_STEPS[@]}" ; do
+		edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
+	done
 }
 
 pkg_postinst() {
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index f1062c723b69..ea46f95c35d3 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index a0e2c178d1c4..d1a46a60feea 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -8,7 +8,7 @@ DIST libgcrypt-1.10.1.tar.bz2 3778457 BLAKE2B 46f30459891183b6d9ec18f1c7907fee0a
 DIST libgcrypt-1.10.1.tar.bz2.sig 119 BLAKE2B 5261d7dbfd5d82b2d3fa2ebf864a9ef0c7c978dd66a71c078df7bbb3b63f5d85180e5f909f43a49712fc16c45f7aabaa6bc30ed82a39ffc9a5d483ea6a94d162 SHA512 b156ae05079776698bc95ba5a9e48e95de8f716aa1760ef4b2e7cb8518ccec660337fc7823f865bde870461800d472fd8e458d03a7095b6bb614f6dd96f796d8
 DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
 DIST libgcrypt-1.9.4.tar.bz2.sig 119 BLAKE2B 4012c22259a9fd56f9da6c87d60077cea0dbfef85d4d4ad1ff6a2375ddefafc4cd03ee9083d18e080c14c95887b495062af886732a9593bcf1b8f187d21073fe SHA512 4aee16449b4b50dac62bd80217e769f32f43fb7cd994402b7d9cffbb1934b2771041c8c0c41a63ced9c8d9408025f9c5608ffc7f00e5e9a9b92a07cb5118a98a
-EBUILD libgcrypt-1.10.1-r2.ebuild 5976 BLAKE2B ae3b608b57a946372cf9634c3672eeffa8f0b2f5b2c85e42ed49eaab1aec3ec45edf4a3470569e6f919d02ff152f2c8dcb0300d10dad24c2c27d7132e2b14bf3 SHA512 5ed73f726648ead960b9816248ce49dbb15ab8a5b983ef98b8fb1c78fa88b18cc3537c4ba59943df2f4d8a222b9be29afed9c868d971cc4d686acb0fd695b86b
-EBUILD libgcrypt-1.10.1-r3.ebuild 6036 BLAKE2B d1c610d1dc426581b644bf2818f66c15c2cdd947273bfb2460404b818b38eebaef19c5e3de6f402835bab0c618848c00ff1ee386fdc4d659726a8b2cbfab2fe2 SHA512 c8de1a47d79d4f51e383fa315dab7203ab48ef8eaebcbe7f0b4d40131b2e6242a40c80e456d80b99b08b437fb3506b66465f1a18af208b5f2826e7ec65d371cd
-EBUILD libgcrypt-1.9.4-r2.ebuild 5021 BLAKE2B 28031c72d8ee46ff5ce9820339c3397d6300e07c0a7f6a88b91c2cea144546001cb3d5a2bf3a47d4018ae1d5ebfc565e2789f1b5255e581382a44b2b5949b4eb SHA512 c6cf36fac494c3e90dc1b4b5178a83676b55e5bb785644ba79af83febd431d123e1dca0f4092863e3638e476465f4fdb8e5ac0ff2418ab276e05c0761a56e908
+EBUILD libgcrypt-1.10.1-r2.ebuild 6237 BLAKE2B 0246702c6936eeb86f380b1e1757d7e98b25a88f0e287a68286d141fd085372b4b2b89a512be141db66edfc8117a918fb18d0e8958f91b7528a56e3db5487f45 SHA512 251f1389ffe471a63674bcc9329d6291dcf4cca5a0771a5b7748082efebd76f0247b433a460dae74630acb140a122708fc222e140c3d82e1d906ea5efb0849ea
+EBUILD libgcrypt-1.10.1-r3.ebuild 6297 BLAKE2B 9d0e5daf8b72d24a497804acb7e60fbec0ec69480f8760eb3c86caa965059c98492c8bca8df68a1066ea657d4a918a8a6e83f421aebef784dfa1010a6719fe9f SHA512 e8d09b85be28512be902aa6195f9803f7efab73d72dd6e08636b12511b97d8144c4b890b7301c59c299749d8c8b2f3da6a47f4b170e19c8927aeaa06bbb19707
+EBUILD libgcrypt-1.9.4-r2.ebuild 5282 BLAKE2B f86b756b1497055d15abbb53c603d144b368c18294d7fa48f18a26eba7edd3544f4c35484f9c9acacd63f1912536f64bb7071eb4bc52f919ef161ba3da003f1a SHA512 21fddd979d7529486278d9fa0b0b076dce1aa3219cfcf9af95e4ee1b6730546437ab83aca869b74a8e61413b421eddaa38495bb3e3a8aefad336a76ac5b72a15
 MISC metadata.xml 510 BLAKE2B 1c3a524d74fb388a17465acdeb777872600347779635e33b8f235b59a464690cfd2ecd690b8fc0080600f1180e98255fe367dbb0dab70d04bf546ad7839de72a SHA512 2d1f11194b5ee566ed7a787fa7e40ee2e14511e9f94467ea84b4b3a8395a908c0f95044bda0714dc7426f47d81b0ff977d15654bd06316cfd4a00424242ae900
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild
index 5614f817ecb3..fdaaf606e1e9 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -105,6 +105,13 @@ multilib_src_configure() {
 		append-flags -fno-tree-loop-vectorize
 	fi
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	local myeconfargs=(
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
index aaa53b979288..38cdf50ad91f 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -106,6 +106,13 @@ multilib_src_configure() {
 		append-flags -fno-tree-loop-vectorize
 	fi
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	local myeconfargs=(
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild
index c7a2a6fe71fc..d164dfc4b237 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -78,6 +78,13 @@ multilib_src_configure() {
 		append-flags -fno-tree-loop-vectorize
 	fi
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	local myeconfargs=(
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 98e8fd6e1719..ae28b0167407 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -3,6 +3,6 @@ DIST libxml2-2.10.3.tar.xz 2639908 BLAKE2B aef2cc87e4632ddc478ff719155fdcb17601a
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.10.3-r1.ebuild 5404 BLAKE2B 8be3dc790d9301278ffa30c428d927c4bdd2a223576e3e555632f79b1b55dfc938591eeb9402f7c95aa9233008f557bf245becb4d681544d2d878a76cdb71a1b SHA512 70d383ad37d2e287f797bc5d23e15afaf1ce511e65efca049c829627a903012ac7be7502abfb79faf266cf739fd8db10402d49894fac13e4262a83c3d298a664
-EBUILD libxml2-9999.ebuild 5343 BLAKE2B fa2e989b69de88debcd297c7dd36de32a97cedf82d4805f42aa64b14e74de80e81595db9a21a403b9add5e38152fe70522f78c6cd790afbfafc9e7dd2c24d8bb SHA512 b1c9e62c4c582967aa5b1c247fa3a09dbe6e3b01125ad18a676f63e4940d20188949812e2103514f1ab194cf8887afd63a3abd82a905b508e298445a72f395c6
+EBUILD libxml2-2.10.3-r1.ebuild 5681 BLAKE2B 6083b2c688353537af94f5595bfce9bc40bc44c047e31c9661ef798c041be780b2c8b60d0866f159e34d20d977f0d1ba843d7c457344fb16fe54e1fb016a6ad0 SHA512 fc334fadbbdf6e270b10c31a4d787e6105050586a2725a52c045bb9562441ef1a39f19fd6ff8b07f6e39a852c17812ae00d75990efbe13c49db796503abc69a4
+EBUILD libxml2-9999.ebuild 5620 BLAKE2B 0470117a7e5a19688e69a874d3b8f0609408a65b4b806d36b415f08a8297b64a3f3154bbb753350a737b9602a60ef86415770c9d8889beff275879707003ada5 SHA512 516c42c26fc65bbe1b5d698b7e79c4af453c0a90c55798ca28a2429c06230a794284938831d874f6c5d8e698c35f8bdf3eb948beafd6938faa8c8b4f7ed6c546
 MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11
diff --git a/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild b/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild
index 3430b84072a1..4b5648cf6460 100644
--- a/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="xml(+)"
-inherit flag-o-matic python-r1 multilib-minimal
+inherit flag-o-matic python-r1 multilib-minimal toolchain-funcs
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
 XSTS_NAME_1="xmlschema2002-01-16"
@@ -102,6 +102,13 @@ multilib_src_configure() {
 	# Filter seemingly problematic CFLAGS (bug #26320)
 	filter-flags -fprefetch-loop-arrays -funroll-loops
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	# Notes:
 	# The meaning of the 'debug' USE flag does not apply to the --with-debug
 	# switch (enabling the libxml2 debug module). See bug #100898.
diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild
index c5e2199726d3..556f5e715652 100644
--- a/dev-libs/libxml2/libxml2-9999.ebuild
+++ b/dev-libs/libxml2/libxml2-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="xml(+)"
-inherit flag-o-matic python-r1 multilib-minimal
+inherit flag-o-matic python-r1 multilib-minimal toolchain-funcs
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
 XSTS_NAME_1="xmlschema2002-01-16"
@@ -100,6 +100,13 @@ multilib_src_configure() {
 	# Filter seemingly problematic CFLAGS (bug #26320)
 	filter-flags -fprefetch-loop-arrays -funroll-loops
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	# Notes:
 	# The meaning of the 'debug' USE flag does not apply to the --with-debug
 	# switch (enabling the libxml2 debug module). See bug #100898.
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index 95a8f4fcedc0..e7f96590d63d 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -1,3 +1,3 @@
 DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10c9f8be47c4af5f3bf5968f709637ab3f4878bb68609752fbb6ce1364e109fdfeba64e4db258733a33f3fc SHA512 2ed1012e14a9d10665420b9a23628be7e206fd9348111ec751349b93557ee69f1176bcf7e6b195b35b1c44a5e0e81ee33b713f03d79a33d1ecd9037035afeda2
-EBUILD npth-1.6-r1.ebuild 780 BLAKE2B 71a78816a5a6ca2f8c02377f4a31cb0badfe7dc1306beb31fdba151bb77770b810de7c61eac14cf49f5652a7ea92899f6a0be32dcf324e11fd6f3d8f832447fb SHA512 2fb1b035d9666e10d50ba33b421041ec4e5a0d2279a31fecc1a253c15355978862e752af21fb80c0c70beed092d5276df968c9cb3308fa2ca47ff3c8bae0fbb0
+EBUILD npth-1.6-r1.ebuild 1070 BLAKE2B ae01898ebbec183e5ab0f5147581f52dfc50a83e47afaf582466b4351c1b2b2c8fa81ac1ce8c7fd9a748e31870abbc688823b6b1ba02cc944879180864a159c7 SHA512 422f88da6729a3bac7fd22a9b271a360cdf0057ea063f58e4e631165c7c7d66a11bd131d3ac9095b648bc94de2aee097d6cd0482dd6a79a35cc5f08872d52927
 MISC metadata.xml 248 BLAKE2B 8635d7e87f0f2de85f967cadf3324aecfe013decb6f6dbc4338f2bdbb3fad5b61b5a58780f4c6d4759ec51a1b89af067b689b716ad34c71b6f09887536da1493 SHA512 fb771f3d411fc1ab3e5600af41fc51d254b7c2c4d057e80e582fcf2f355f35204e7f61dba852bed35f21c87f2063d7ee0d3a5628395e4ed945955a818deeb37c
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
index bb3c8b84c723..00a8ae2ae917 100644
--- a/dev-libs/npth/npth-1.6-r1.ebuild
+++ b/dev-libs/npth/npth-1.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="New GNU Portable Threads Library"
 HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git"
@@ -21,6 +21,13 @@ src_prepare() {
 }
 
 src_configure() {
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	econf \
 		--disable-static \
 		$(use_enable test tests)
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index 42b762a9fcd5..539bcc33b8e1 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,5 +1,5 @@
 DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
 DIST popt-1.19.tar.gz 596676 BLAKE2B 8f8965e2d339f0413e8d1da421ea7556526f39f089a822063d6fdc35b781a7c7ea84a91d6af3e25902c1f045f564ef956fc69cd4625e6cc008c9e3ca34923a9d SHA512 5d1b6a15337e4cd5991817c1957f97fc4ed98659870017c08f26f754e34add31d639d55ee77ca31f29bb631c0b53368c1893bd96cf76422d257f7997a11f6466
-EBUILD popt-1.18.ebuild 1057 BLAKE2B ad6668d5d593b1b7501d4851edeec5934fa6e4de2ef4a309ef43330655e54a5952e78e5f9c4521c0eefadfbfcec1c953c8e2868ff116660989ed36896a3b3646 SHA512 b706249c10d63749176de4d37cad198c134ee2cbb98d06a871f5cc3cf0e1f6b837755f3e66c55ae674d3805d4d89596f309fb5eb2f30ee688a05db333b7a1f63
-EBUILD popt-1.19.ebuild 1229 BLAKE2B 46bc37c7d411a9b42aa587ed934f4a3fe89bd55feaab9319d51605e632b5aa1bc9cafe86ea09268766028e592d6963967721f71086288d948f401941060ccf3e SHA512 9dda8932df6851db52df6753baa28fc530b5c5144c7e9c3998baf0aa9f5d5e90aa3e37b37904180322cf5afa438726fae238f0c3a2b9a0d4b63f5db88cebab93
+EBUILD popt-1.18.ebuild 1347 BLAKE2B 215f2acf0edb9fdc4f64baf8e40355f181cf1974e69daa4859150916eff994c772eb86ece98801dea8b814035a6ec3ec319c8f15a5f6b465ec0f9fb0ae3bf2f4 SHA512 15245c2721dd8f6a0ac05bafa347077578d571ee4b7da81ce7848b9a45f963e1aeb8121355354a1587637efed5781411e340e80c762e0f2144a8c92d462a0415
+EBUILD popt-1.19.ebuild 1519 BLAKE2B 619653ce7416d5932ae3d65da47a0584c099061a82f76525da3eed5e7957d93d67599ef6f5f3039c79925bb55a3c31f73faec9bd78695e5054e0d9ecdb76eb39 SHA512 b37473f4fb44e5ae328f78bf114638b61f4921de88275f016b7d360c97139ff885ffde02df26a853ab1bcbfbf977aa38d46234fe7543a35fa7e03d3283241013
 MISC metadata.xml 412 BLAKE2B 6fc4208a8032652bfc2f48606c900686475617e828264bb8c4adca481c0de8f73a67b39e418143c6e75e8dec185d15f6050b3b7bf7e2f3ba14bffd17a59b2418 SHA512 aa4b2d96f2588e7fd24fc7a7f793209b431c9628e1ac05f79bdb52edd1582fcf21e93491e2ee241ed8b3aab2b83a1b047c819d030413e013b0d90d4cd4ba2393
diff --git a/dev-libs/popt/popt-1.18.ebuild b/dev-libs/popt/popt-1.18.ebuild
index 435dcfdc5e35..cbbaee017f57 100644
--- a/dev-libs/popt/popt-1.18.ebuild
+++ b/dev-libs/popt/popt-1.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib-minimal libtool
+inherit flag-o-matic multilib-minimal libtool toolchain-funcs
 
 DESCRIPTION="Parse Options - Command line parser"
 HOMEPAGE="https://github.com/rpm-software-management/popt"
@@ -25,6 +25,13 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	local myeconfargs=(
 		$(use_enable static-libs static)
 		$(use_enable nls)
diff --git a/dev-libs/popt/popt-1.19.ebuild b/dev-libs/popt/popt-1.19.ebuild
index 483bb167bd28..bfabb9eff090 100644
--- a/dev-libs/popt/popt-1.19.ebuild
+++ b/dev-libs/popt/popt-1.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit multilib-minimal libtool
+inherit flag-o-matic multilib-minimal libtool toolchain-funcs
 
 DESCRIPTION="Parse Options - Command line parser"
 HOMEPAGE="https://github.com/rpm-software-management/popt"
@@ -29,6 +29,13 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	local myeconfargs=(
 		--disable-werror
 		$(use_enable static-libs static)
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a9f257a4c4b0..393edde3f691 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 1b38346fee0f..62678dbccbe2 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,6 +1,4 @@
 AUX lxml-4.6.0-tests-pypy.patch 18051 BLAKE2B 99d97fa2e874c9bec4a866c3303b54ea2ab1e6abddf148d142cb66ee035b1eab1e05eed924d34451c5db38dc37f77104539cbfc2fe45815c17445b6359dcb857 SHA512 f6c6c2b00a49e6ca19d8b9123c364003a682c2e8df0c42d8600085d1cb094ba5cedd162bfc794e7d9acfff93aac771953dca5a879c3b957af1e2e8bd1db05515
-DIST lxml-4.9.1.gh.tar.gz 960663 BLAKE2B bb464757f9188a76661732d237f3b0f9010f51dd9c5426b578ca8fdb486d28fcfec81d4dd817b2fa0601ed9d7890e01ce71e4ea4c842b92e59dd5437200bad22 SHA512 f52d54908f92997f610638a9a3054cb73723ae81a5ad9e77918b0603ec7441b0e7d2143f8a8ac66c05cd6a0b3b298d348397b7e2df19f83c21e336514c47d910
 DIST lxml-4.9.2.gh.tar.gz 957365 BLAKE2B 201b3977da90386e413f1b89a4b7ee1e44d6bbea05e622e92feb1d67c637ce46ebf746f0648f034ed3bccd609233ccf7d8a7ee456f13b8d9ca8587ddf1ebd32a SHA512 816b2fe2eef2a97a0df66cbc39850c6dc3d6470e4033cc73edb40c80c0afbbe6c084d042d7c98b29497926e76f648caa42e1ebe5d83060af08af6972316077b0
-EBUILD lxml-4.9.1.ebuild 2821 BLAKE2B 729b0f9a61f67a426765d463880e124baea9055889cfc6e59d112d3e870b826a6ff9f666e5fd323509c5ce530fa84cc2fea0f53f1c23422788e6d074740d8426 SHA512 de4c1edea66adf9f5959d7e14f0610499170d5162de22cbd4e52e1fee666cb8c95e0626c7941df1830238d29e12d7b488c4661a1f7142fe14e94d1d92e0aa5f2
 EBUILD lxml-4.9.2.ebuild 2854 BLAKE2B 8f2275d2cf38e7f6f2687f796ebc50eb0f1208abbcf2d6b77d0d784a0773ac2531a7dc4ee7ed2994b335231d36306dd6f777819cd11b3edc706ffcdc0727735d SHA512 de1868d7a7d5753c21183b8cc14df16d2691ccc5ae69843c99ca0e03b75ada74004fe387d3d19f585e86a4f6ce67987ce3d07b0c1a1e28a2794de6d03416327d
 MISC metadata.xml 463 BLAKE2B 9bcd092b61568f5d467230617b101f36245c41078e6a66c7ff63b22a6b4095de2ba3a59e48ce8b7842ce58d1255fa293995652daa3fab4c3af988498eaa30e97 SHA512 2ba5e340b59e0de4e472380e9c19b1f6f573e86e5c3c2e075f6151d369e94eea70e3ce36bfb5ece4da3fa69459e3ff83368f1df8302aa5754ae52f13c8f2312e
diff --git a/dev-python/lxml/lxml-4.9.1.ebuild b/dev-python/lxml/lxml-4.9.1.ebuild
deleted file mode 100644
index e69e0890908e..000000000000
--- a/dev-python/lxml/lxml-4.9.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="
-	https://lxml.de/
-	https://pypi.org/project/lxml/
-	https://github.com/lxml/lxml
-"
-SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-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 ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-DEPEND="
-	>=dev-libs/libxml2-2.9.12-r2
-	>=dev-libs/libxslt-1.1.28"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	>=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		dev-python/cssselect[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
-)
-
-python_check_deps() {
-	use doc || return 0
-	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	cp -al "${BUILD_DIR}"/{install,test} || die
-	cp -al src/lxml/tests "${dir}/" || die
-	cp -al src/lxml/html/tests "${dir}/html/" || die
-	ln -rs "${S}"/doc "${dir}"/../../ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/yaxmldiff/Manifest b/dev-python/yaxmldiff/Manifest
index 15cfe8190b7d..4572653fb72a 100644
--- a/dev-python/yaxmldiff/Manifest
+++ b/dev-python/yaxmldiff/Manifest
@@ -1,3 +1,3 @@
 DIST yaxmldiff-0.1.0.gh.tar.gz 8938 BLAKE2B 9fd9b9ede1d5c28c7d5a47967748de411dbc56b0191c4bcb7f2ee6270093523172497d470c6b99e87ccf50c8a70310500b103ecc3d28a49046f09c70055564b0 SHA512 3b853edd13a95f92d82f563d784d30df4f2876d0a9bf89ad67b3e53228a908fe32407386c221725b30668ac2b98be98623a2fb6da8e268380ee586b49e5ae78e
-EBUILD yaxmldiff-0.1.0.ebuild 736 BLAKE2B dc8117eb02815a3b91f26f6ed1eae632fb6b6e73543ad7c769963a68276aa49c2dea458b2a8bba837a38d50fc6471508ceea0f03fc3b004e0d37d916cd227bc9 SHA512 c2163ebe362a4374a8b027e9ad839cd15e3c8447b7602aa9bc48468d307e085d93c97d7517fafb79d629b47cc7b20c2a980957ed0cd3a46be3e482c7db8ea879
+EBUILD yaxmldiff-0.1.0.ebuild 735 BLAKE2B d00e918aeaf480648bd3cc6a214cc98ec7272ed6a45ceebc98608547b3c154ea23db16f9c93b532536d96718065d192e2eee83497a848991407f80f47fe9d5d2 SHA512 31cbc3304247a053b19c329664245d85c3176c5cd69642b214d7aeeca2ba55c0204a718c383c63b308951899c5783fb7731a9654bb3e090adb29608724a03da1
 MISC metadata.xml 322 BLAKE2B d150713c55bd5a505278eab1b3912481dc9450ac4aa0e71b5f91807e967ed342e35763dc3a9dc6edf19ce31b6ce93d94aa6b751e2f88d58d01a30c0e3d6a0ffd SHA512 91346390be609364c482375fbef62e11ea5d1d0b9da9b36c1dd8b0a45f2f01b682c3fcc67035d1e6ac45e6468c6c5b63cd365b672a8adf170ecacc5bdb43fafb
diff --git a/dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild b/dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild
index 9b9c9624f64f..967f08f3890b 100644
--- a/dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild
+++ b/dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}.py-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
+KEYWORDS="amd64 ~loong ~x86"
 
 RDEPEND="
 	dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 473f026b0912..587571028344 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
index 3c5b7786a473..0e5141cc228a 100644
--- a/dev-util/gcovr/Manifest
+++ b/dev-util/gcovr/Manifest
@@ -1,5 +1,5 @@
 DIST gcovr-5.1.tar.gz 1676960 BLAKE2B 106c30c7e349f8ffa7a9c52d70e59c32799a8def11986027e3b794ada07fc11ab27b322c377b553f4bb96ca8662bf152eeb7de2d1913381e6068123d2430aa6c SHA512 ae2f0d9ad04f2dc851db9bc99a30a5dc1b1f43dbc6336422ecf5228d37f6994406a83e50f1ee6b5c8d6ec6d7b9e2bba726fd3d502dc5022fe359d480e6d267a5
 DIST gcovr-5.2.tar.gz 1381017 BLAKE2B 8dcd7eb5d482f2020eb29da74e215f0b7731654a66b4ca6d0d919ad6b7eebe564c211a8ec5c4ef87efd61e7c18bfa524aae56d653522f23e4bb902a3921f9522 SHA512 d1a4dd63129ac1d2b9a892ced9b4a0644dc49dc3a115d81ddf348e43fea0e7809c6533104106da8f89a666a4af9ff5a62429b4270ff2272ca61bbebecb7fb921
 EBUILD gcovr-5.1.ebuild 1010 BLAKE2B 5ab8716f554c9d28731df15f064bf96f6184dfba6f58da14c1fdfb7e98c61d7809085e790c98e65b078716304bb3ec660385b929726123fe7aa993d1dfa2fad7 SHA512 a0e57036967b5b3256c2a77792dbe92c8c5f1a2c1f5258131f2c279bcef6a780be385d3942d3ae95a2f723844099187e4b44b627cd5399ae828fc8d43f02ae3d
-EBUILD gcovr-5.2.ebuild 1057 BLAKE2B a98aa6ed20b365467c1b362ad290a81dd97054e073481c1f80dcead979e71b707c0127a498f9812cfa062adc84b35c26a450d9dc30b94749347eb476c0a98f92 SHA512 751fee502c0ad35a6125770762b1db500052eaaf373841495ca39cd68b0b3a884d11894109294155ec6450f8442469ae152cf8de747d3caad010e7c5b4c32ca9
+EBUILD gcovr-5.2.ebuild 1056 BLAKE2B 71f8295c2334e921391bb5ec57cfbbaff2f5e8c17f1efce79c308d1ea2e4d85ac740dd243bfa5762b26f7ccec66a01948a60011744dc08bc15cc806dcc247139 SHA512 f88ee9df9e9ae5b448915791aaca18cfb0d3c23e86073922260897080c4dcb27d5634392b61fee0c3f9144d5de2dd6072b6e7f9d0cc11a4825590cf84d188a01
 MISC metadata.xml 326 BLAKE2B 0ff392fe3a804fc6d8ea83de983357676a8155dee2fbb5204baf0ead2800210ea30a0171398c71dc60b1d9423a6fd65c0a9032d4511caa459c9b4d4f70ee4132 SHA512 5f5a49bfbbd3d3b77314f7de0c5981a3e700b42733d1c4f6868a7c25d12bb6227ebd254925cbbb6a5d73bf8a0b9f99115d396009d55797e39b53dc43a1a79107
diff --git a/dev-util/gcovr/gcovr-5.2.ebuild b/dev-util/gcovr/gcovr-5.2.ebuild
index c41db83d8824..40e2208a9e4f 100644
--- a/dev-util/gcovr/gcovr-5.2.ebuild
+++ b/dev-util/gcovr/gcovr-5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
+KEYWORDS="amd64 ~loong ~x86"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-util/makeheaders/Manifest b/dev-util/makeheaders/Manifest
index a6a4ef6bae37..40f5c0a0a477 100644
--- a/dev-util/makeheaders/Manifest
+++ b/dev-util/makeheaders/Manifest
@@ -1,7 +1,4 @@
 DIST makeheaders-0_p20220411.c 100587 BLAKE2B eeed8554a444573ae66c479460c3491d1f23d1982c8b5656eefe78084d3a550a85285cc58fd3374af30f5e8803bbf7690d643346a3fdf1c98dbb7d2b5224bd65 SHA512 1add4012f1307b6273cd46f7a6ef10d1d003f6ce214521e05ffc232d90991e6596481110aa582e104c09be67cfdc94776ed85458b6b9bcf9bf6c5d633371d6a4
 DIST makeheaders-0_p20220411.html 40335 BLAKE2B 6eec5080226d7759e8bdf97b2238fb33e85700d29b0b539fcb797fa219d9d00461aafdabf2642e2cf1a622cf633cf889d71381bb3342113736ddfdafca3582de SHA512 6cccd5388e8af6f814d735c643abb231dab21a16799fba080858b15885a77b99bf37a5c7bac72958bbfcacea2ed54635ccc6323f5c7d47e2a1a73fffa8952504
-DIST makeheaders-0_p4.c 99253 BLAKE2B 103d4b1d75fb3cb38fdf97dcf051f263c1ee7c08f8d2b4b791994948f0323cbf69fc66840464591ea8596c7ab6857eaf9ddd56bb69f2f035f57d99fbf5444992 SHA512 d46a23a4ee1436f1bad2f0d26e7de9be47a84b0c163430bdaf360c4c6a94b84949f2a427683265898312e56e9dda316992857e488202aa74afcc3939fa712a35
-DIST makeheaders-0_p4.html 35481 BLAKE2B a5e4e4804b612eb164f46cb8ef664952b3f1819a2915e2e905b58e6719cbc7480e4fd2f81f1d1d91b2029b15ed0c9b2c799ae99538b8ad77d49d3606d91b50d5 SHA512 903437c9d4b280af1cb9d5e29df150fb347ef9c62ec146daecfb5c4093554531c206bc73885cc7aacea1b7c24fb473e240a03a31c139caf6bc0e42901b518597
 EBUILD makeheaders-0_p20220411.ebuild 1176 BLAKE2B 7bece779ad96d2b54cda9b9842a0ac383bf50700fc7d9db13dbb77c274cd2672e0b2c93d20eeea62d92304cad07f951ef0f1a025c097aacbcd7268ac981aea7f SHA512 4190f9110293c2523b25bea0d1422eabedac52fb1e1817d47170477577c9b80dd1ca83b0c91b30e460b3f0799b82830930fda7a2e155956b7282ae6ff0b72a5c
-EBUILD makeheaders-0_p4.ebuild 658 BLAKE2B 4262d895536f636a1037d784ce6ee55b28582f94820a6651e57e4bed44cf4827883483472501313139f515068015a949e6c1df641431bbda51a0448f57e8210a SHA512 3119779bde55879cc88056259db02233ac57e55f7c8b6d1fd7b6ec348b30f5677df0370987c66b9738cd2cdb3ddb3d8250366318482d80a3530f5bffdcbf7465
 MISC metadata.xml 957 BLAKE2B 4faa7988aceb8b8e447b004aeee96c925a1f458f252953e5b2ae50e09884168936f1b229c5fbdbdcb46bcde287e2bc98971cf7822af77bc0db17b09b4491d99a SHA512 50df46503a6dfa2d61cf628e07e06355759abce269012db8603fdba32d7d31e95e5e9fb08c6c10c2e10a46af0a62f666ebd19c5b932063a9f958068ed4f5addf
diff --git a/dev-util/makeheaders/makeheaders-0_p4.ebuild b/dev-util/makeheaders/makeheaders-0_p4.ebuild
deleted file mode 100644
index 0d4b0aa383c8..000000000000
--- a/dev-util/makeheaders/makeheaders-0_p4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="simple utility that will automatically generate header files"
-HOMEPAGE="http://www.hwaci.com/sw/mkhdr/"
-SRC_URI="
-	http://www.hwaci.com/sw/mkhdr/makeheaders.c -> ${P}.c
-	http://www.hwaci.com/sw/mkhdr/makeheaders.html -> ${P}.html"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-S=${WORKDIR}
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${PN} "${DISTDIR}"/${P}.c || die
-}
-
-src_install() {
-	dobin ${PN}
-
-	local HTML_DOCS=( "${DISTDIR}"/${P}.html )
-	einstalldocs
-}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 96a4ff5eb6e8..0e114ba5ab63 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index 4784839ded29..54aa3a909369 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,7 +1,9 @@
 AUX 2.7.6-prototypes.patch 873 BLAKE2B 35bd3316dd455eac29909fa940542bb4f0aebbb08ceea3f52681f8bc0546c565d84aa4a18f670c1771fc68a246e45ea47467acfc1bd8f4031b28db9d03b0461d SHA512 e474d2e6852cd2b24ce88d8e550de54b036d91635ed7d60892985d7825ce18b457d767c90a664c63eab7aa587c61c9f2ac0f1cbd0f8765b2bd71cc04910096ed
 DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 0326a698f3be18da47c99cbe20e5e51cde8abcaebf365b3f00e5b1dba6bfaed5139b65766bd447dc596736da504063d5c87c21d1c5c11d6bc7ebd947d9d44835 SHA512 a64747d745ecd5a2f61d486cd8fec1bceeb97ce459ec57454311a960dbfce526c15e8bddeb16860b8efd9710de93845adec61ec892355a0bef7bddc4517e1442
 DIST imapfilter-2.7.6.tar.gz 58644 BLAKE2B 6fd5b8400527c3749cdb8a1df0ca0cbab7b77e8fa29e0bc1bd0eee95832aa16c9b3a586b4e4dc9f9632319febdc619ebe6b05e60c46fd8ccf430f6714900588d SHA512 c76a0986d338e2b74ccf38106e05d4c0a25789a6d80f0cb79ed4a165447a4c96cbcffb57e856fdfd465283feebca6445efba52e65289442a7f313d343c519083
+DIST imapfilter-2.8.1.tar.gz 58382 BLAKE2B 41a6675e90bd8feb2c440923a6059caee1eecd4490f55704e11fcfbec92c640ebc264b40cd71ee051f66d6d060a1ff21907a48611baa14a2139c2979017d4ca9 SHA512 1da663a36b0c6091c3da84d78c6826f2c8c13fd20e32723ad9647e5bf942c12cbeb327a71cf38ed2076662d65207edb3f1087d5c94565a583b8a583543d4bcd3
 EBUILD imapfilter-2.7.5-r1.ebuild 979 BLAKE2B 372852b1f8937b324e948d26df05d0d05b2328c93ff5206fac20f4c26f453b3d434134b44e7e0e682399197e6897300d577a9193d08162f87334cc154bc3c643 SHA512 2fcab5d73524d8f29cbf9252b830d74f14c1a966729db36fbeadf5a127d8dce298043edad48a8a01929af09ba3829fb8a2bdadd2ff264394369787c0e2077bf4
 EBUILD imapfilter-2.7.5.ebuild 968 BLAKE2B cc04dd3b71945338e0a645787a0556cee83bc598fd8df5c4ceefbba4add9c93e57efd23fa7d728a2d4d2d2c3dae40cc71455ffe59b5c41314604365013443c89 SHA512 a2f08bb5f773fdfbb8cb70a4643c3f105e7533ebb9edf0c1dcbac36635c6928c01f1bcac6496a8f577b29e2639d80c899a2561f4fc8ccaa2bcb587ec8b901078
 EBUILD imapfilter-2.7.6.ebuild 1026 BLAKE2B 30d15cf342c5c4ea7414f5a28abcc22c516281b7a4390629391839f59a0d07e2e32f0db8604e6b8787ba5568f41dda4f3277221d134fd8c5bcc2cee5de7d2bf3 SHA512 69b276bdd5ddbec51a04901412f321c67b09ec77a5fc11edbe665941bc2bcd988890b1bedd97bac57fea8c3f81f0e2afbca75b2ce1a38ee643128456163f579b
+EBUILD imapfilter-2.8.1.ebuild 991 BLAKE2B 2429bb0c89bba2c6124dd1b5c20ee86a94746265992e1b466b0b46ecf55c6bb1e588ad79e38d36f87cd54b0f080b2e55bec51bff4ef2300a74cb2b6f255be96e SHA512 ec6057d40f987e9612167ffae3cb66baa98805d7494f8a5b18bbcb4c795df1923807845cbcd6436dc7d7d1fb6fa9c26581e3c108e6c55bfb9a2c1017f49d7cf5
 MISC metadata.xml 493 BLAKE2B 26e3c22d49d62547bfe45fb39f153589cf3f2b7e7ea07a170b91e880bf3d337de8ae7be36bf684d3cbb72416a1442e896014cbf6ddba14cef95b680f2a5ea7e3 SHA512 9300b493b8728a141e05af8c343b776a93ee52a01a69694050b9ffb392770b81ddef37832c6b884fe51dc9ba3ecc41bb8ea4f9559f84dce1a71382bfe3d0e67b
diff --git a/mail-filter/imapfilter/imapfilter-2.8.1.ebuild b/mail-filter/imapfilter/imapfilter-2.8.1.ebuild
new file mode 100644
index 000000000000..4b3fbdf18f37
--- /dev/null
+++ b/mail-filter/imapfilter/imapfilter-2.8.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single toolchain-funcs
+
+DESCRIPTION="An IMAP mail filtering utility"
+HOMEPAGE="https://github.com/lefcha/imapfilter"
+SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/openssl:=
+	dev-libs/libpcre2
+	${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README samples/*"
+
+PATCHES=(
+)
+
+src_prepare() {
+	default
+	sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
+		-e "/^MANDIR/s:man:share/man:" \
+		-e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
+		-e "/^CFLAGS/s/-O//" \
+		src/Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		LDFLAGS="${LDFLAGS}" \
+		INCDIRS="$(lua_get_CFLAGS)" \
+		LIBLUA="$(lua_get_LIBS)"
+}
+
+src_install() {
+	default
+	doman doc/imapfilter.1 doc/imapfilter_config.5
+}
diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index 63d9825e2616..f86a33a2d578 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 5b882b23a02b..a0fdfa37a5f4 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,3 +1,5 @@
 DIST caja-1.26.0.tar.xz 5283368 BLAKE2B 8449d7d721a997458102abf0fefcb35734a1b254280a4b8baa14667913f2a3006c31583d956de54ad7fac9e1da70057e058547eb7e3652a1dca9df9e9628a3a9 SHA512 0abbaebe6dc24644d0e5057fe79e57f67a1e5208f6aa89289649e6e1940285e4c169ec42197ae933f663a9c69a7f09295003cc645492db6abbd9ebce7085c03a
+DIST caja-1.26.1.tar.xz 5263564 BLAKE2B 44cdbbc86a24d9d3d6f7830ba45dd82a69b0aadd233531a97ab1cc4dfc5f7466543d70d3f8d6cef4bc669c0ab12b77ca7f22d40f486f36e80c4103c992369002 SHA512 e5d14d1a5f0ae9f86d3250e5a2d10a4e0afdc7ba1b52fcac4c8efc0a4c555d0208be3caf3aac19cc4938fe4c20e82f1f81d259d30e5d8fffbc78708664d23d4e
 EBUILD caja-1.26.0-r2.ebuild 1993 BLAKE2B ae3d6d7ff34f4820feddd1a64be8fa7f30fe6e93801c2ba354b6dff242a4439ba7d7dbb9a166a0b64de15a5ad707f7ca44f5db98296254c27ff7df229d29c701 SHA512 d384c12df4a14b4b224d0c87a56a4df21998ea975d0f577497d46486fc5bec4de74e377f6894497b61808d82b60d7b0c25f5cfc1fe0e03916759aebc528a6657
+EBUILD caja-1.26.1.ebuild 1995 BLAKE2B a858e4b7e9ea8a00871cb4474cacc606a2031960b49c8deae454334f22284d9eb0fa0bb99770241799eb100687947d57c44422500f6a4dc303f348c1f15c3c18 SHA512 d151440f958c0b611da9bf5b041f1e870d327d14db55f2afdb85ef5b2ba8d0d1059c99fcdc19a006d4c7ea14a6612aae44bb5e0617fd0e525d602ed5cbd427f9
 MISC metadata.xml 503 BLAKE2B 267b4158b1b15e8db5624bdf963a97fcfdbfcad2f8f5fb94a45ba5d10ad82e6d8c45c495e64935a58b32c0653730660b51cb18d92a230496478665890a825eb7 SHA512 b8927a09e399b3f65460c13c6ce95dd36e8b19c718174591cc91ca5d50a3059ce4b76bb536530f491201a95c6c10374b03cff05b87e7939781cd0521a39327fa
diff --git a/mate-base/caja/caja-1.26.1.ebuild b/mate-base/caja/caja-1.26.1.ebuild
new file mode 100644
index 000000000000..293d18e0c597
--- /dev/null
+++ b/mate-base/caja/caja-1.26.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="Caja file manager for the MATE desktop"
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="+introspection +mate nls xmp"
+
+COMMON_DEPEND="
+	|| (
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		dev-libs/atk
+	)
+	>=dev-libs/glib-2.58.1:2
+	>=dev-libs/libxml2-2.4.7:2
+	gnome-base/dconf
+	>=gnome-base/gvfs-1.10.1:0[udisks]
+	>=mate-base/mate-desktop-1.17.3:0
+	>=media-libs/libexif-0.6.14:0
+	virtual/libintl
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/libnotify-0.7.0:0
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXrender
+	>=x11-libs/pango-1.1.2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	xmp? ( >=media-libs/exempi-1.99.5:2= )
+"
+
+BDEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5:=
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
+
+# TODO: Test fails because Caja is not merged yet:
+# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
+RESTRICT="test"
+
+src_prepare() {
+	# Remove unnecessary CFLAGS.
+	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
+		configure.ac eel/Makefile.am || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--disable-update-mimedb \
+		$(use_enable introspection) \
+		$(use_enable nls) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	Xemake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	elog "Caja can use gstreamer to preview audio files. Just make sure"
+	elog "to have the necessary plugins available to play the media type you"
+	elog "want to preview."
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 41958f584651..15eabe2f8079 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/tiff-compat/Manifest b/media-libs/tiff-compat/Manifest
index 29c87a10e3de..828eec21aaa5 100644
--- a/media-libs/tiff-compat/Manifest
+++ b/media-libs/tiff-compat/Manifest
@@ -1,6 +1,5 @@
 AUX tiff-4.4.0-hylafaxplus-regression.patch 1100 BLAKE2B 7d45e1b8c9ff6e2956b7190618dea150fa7868585bfe68259e637e5a98655b51b985fe3ee3b08b5ada3335ee2f887d683524a105653c16d48d90b2a23d850d69 SHA512 4232c057d472651d2532814c288399a8bdcb1c0397d860ecb994489d863c2ddf05ce8a2b014ce750b0619f50cc439979607baa2dcb2b9aa97f02c8352ec60170
 AUX tiff-4.4.0_rc1-skip-thumbnail-test.patch 1176 BLAKE2B aec14df94825b3709941b065bfa6eccfef5727ab237feb4022e614749964541b5528f9724763bd86ead8aa1584590cb7900f17123c58d3e4b45a470f240a4d68 SHA512 e58fc43a081205107175122dc6f05281e2c11ef961645e3f0ac4ee6b54c22d3898c978c8ea8984394fc74a92bd81c4fb4a37915d32689314fb97c7f3aeb5b6c1
-AUX tiff-4.5.0_rc1-skip-tools-tests-multilib.patch 1477 BLAKE2B d6daf36a65fcd2afbec2fd5e5f3b75fa4547f32079c0709e98a48b0ba28d993346dfc597ef46b37db5242f2e28c7dd87a1616fe9324ca2d9659a97040bcd23db SHA512 0c7b69ddd772d73fde800e610ed533804392d0ea4ddefa409f52abcf174cc77cd1f4160a03076043d654533e98812d642d5166030d97b273ec80f5288bf3eda3
 DIST tiff-4.4.0.tar.xz 1929292 BLAKE2B d05a2fb293557d1e7cdec116c65c8338d7714af7b6abd8dd3bb2b476d62e044adc7d6c298843649d63c6bc09f6ce4660ee23638f9beb716937ccf236c2829dcf SHA512 c9611faadc9b1199f3aba9a43bfa160c77c11558d1fa358b42115ed78db73c8387531c0668cc9021842c58f1c02f8d84264d3600e1039dfe6f866822ad91cff9
 DIST tiff-4.4.0.tar.xz.sig 310 BLAKE2B 00dc8ff9c232ec4cca8b294659e6379b9bb512b58cd3d2f9231e7c10111510ac56aff3c6fc133a47f9fafc27595e099297c25940414495d8ea7f5a75aa43e9d2 SHA512 4ffdcbf5a8ce4a3be543d0ad43101ddcdb6ef22c3da5768c86660a40cc0cab48032a65c5e7bb0667f43d55dad5aa09dc0df302e2f9dbc9f24b8ccac643a0408c
 EBUILD tiff-compat-4.4.0-r1.ebuild 2777 BLAKE2B 7db0ce94257446523762dc7bae24a4c1d7abd26fff338bec6b0828fbf70a7d5f264acb427390ea2f9040ea6e7495aef35ee98e203f7f3addd3216755bcb1fdac SHA512 a205aa5e46e6029ae54d39e2bd34feb667f3b451c9a65adfb92aae6ea01d1ba9ebc88a750cad9a9db26f26ebe0531a2e5e432447f2a8081922f3b881a1c2ca15
diff --git a/media-libs/tiff-compat/files/tiff-4.5.0_rc1-skip-tools-tests-multilib.patch b/media-libs/tiff-compat/files/tiff-4.5.0_rc1-skip-tools-tests-multilib.patch
deleted file mode 100644
index 831afd287226..000000000000
--- a/media-libs/tiff-compat/files/tiff-4.5.0_rc1-skip-tools-tests-multilib.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://gitlab.com/libtiff/libtiff/-/merge_requests/334
-
-From e7605b93b12c2bf3c864910c23ac976045b5a05a Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 21 May 2022 01:01:35 +0100
-Subject: [PATCH 1/2] test (autotools): skip script tests if tools aren't built
-
-In Gentoo, we avoid building the tools for multilib (32-bit, x86) builds on
-amd64/x86_64 because we only need the library to keep binary applications working.
-
-This causes a test failure in e.g. tiffcp-thumbnail.sh as the 'thumbnail'
-binary isn't built. Skip it if unavailable.
-
-Fixes: https://gitlab.com/libtiff/libtiff/-/issues/421
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -55,13 +55,14 @@ XFAIL_TESTS =
- CLEANFILES = test_packbits.tif o-*
- 
- if HAVE_JPEG
-+if TIFF_TOOLS
- JPEG_DEPENDENT_CHECK_PROG=raw_decode
- JPEG_DEPENDENT_TESTSCRIPTS=\
- 	tiff2rgba-quad-tile.jpg.sh \
- 	tiff2rgba-ojpeg_zackthecat_subsamp22_single_strip.sh \
- 	tiff2rgba-ojpeg_chewey_subsamp21_multi_strip.sh \
- 	tiff2rgba-ojpeg_single_strip_no_rowsperstrip.sh
--
-+endif
- else
- JPEG_DEPENDENT_CHECK_PROG=
- JPEG_DEPENDENT_TESTSCRIPTS=
-@@ -76,6 +77,7 @@ check_PROGRAMS = \
- endif
- 
- # Test scripts to execute
-+if TIFF_TOOLS
- TESTSCRIPTS = \
- 	ppm2tiff_pbm.sh \
- 	ppm2tiff_pgm.sh \
-@@ -156,6 +158,9 @@ TESTSCRIPTS = \
- 	testfax4.sh \
- 	testdeflatelaststripextradata.sh \
- 	$(JPEG_DEPENDENT_TESTSCRIPTS)
-+else
-+TESTSCRIPTS=
-+endif
- 
- # This list should contain the references files
- # from the 'refs' subdirectory
--- 
-GitLab
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 29a91b4e1d0c..42579849892c 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index bf7bcdabbee2..b8ff2da31ac1 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -7,4 +7,4 @@ DIST mpd-0.23.9.tar.xz 774156 BLAKE2B 2c045c86ecbe2267d032ebfd4a18835e9b1323860e
 EBUILD mpd-0.23.10.ebuild 7836 BLAKE2B e20b67d52b15fc09589357782dc3fe948e7d6f2563c93402b124c915dda03cb2cf4e6dca5304f20b778c121ad59941135fbdffeed3d4f452bfb8df532aed68c2 SHA512 21ac27def460cec75aa095c9f5912c51e8c4fce3138353dc6ab10dafb7c1bfb8de970a6f83d4fce251b98342e98b38efe64f3600240f37fd93be3a6b17c26eb4
 EBUILD mpd-0.23.11.ebuild 7883 BLAKE2B 43fbaac7891e7f071124e2ada2c50d7f8b383a2c4b1eef9c4c8231d0c3d82ee97c39bcdec44f7b2c52d94a41094e2db225f7914d6bcf5ae00558df50d766fdfa SHA512 8d6d054d021b1e9382a4a78b5749b2e734cfa2d8eb459b55540b9903f3c24dd366b3f1c28e8cb1b1f0b291b370e61c0eed71662f58529075d3772bb7dd7ae7b3
 EBUILD mpd-0.23.9-r1.ebuild 7818 BLAKE2B 87f87088224425a560f4a2f259a85cec204f768f0bf40290e7945c48b51d62a6d138d87d4474c9fcf9c0d10f4ef369b5097d51c43696006d49926fa2faf25133 SHA512 3c0f67fdb303eecbf3157a73aa43e2fdea376c9556558353dfd185f3bc2c7719da55d9467b90ab2e9e23ec73b16d17e218eb89829baf9c46acbb509b240d1ef2
-MISC metadata.xml 2591 BLAKE2B 1489ef243c32a73b0748d4b2bc534de7022b32e9b8d9c13039885f96d1a3ee7b57042cef775b4b0fd50bdcd778a3d3772916b34618c03250b5eece3afcd30aab SHA512 f8d8fc2aaf25947afe7d9a435fa53944ad7d8fa9df00812f4635eed773280752abc314c2eaf17f178cf31602e0f4d35e606fc13fe41ec7188842ecd7e0a5574f
+MISC metadata.xml 2805 BLAKE2B afe65d7428c79de96b99855e74d8a474df33dbd71fe9f9f65f64270126dea5ca9138a533c9f4f8d422722352574ccbfec2ec64f5e492869e9c97fbc84dd2c1a1 SHA512 74c249f71a819f5747739c6c720d48edf52b62012f9d1fd30bb6027bd3c5794161f7a70b7c87d78a60fa46e37fc94aa449e0b8825bb8d3eea32143bf240e1d92
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 6598be1e8b48..33e244bc3217 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>nex+b-g-o@nexadn.de</email>
+    <name>Adrian Schollmeyer</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
     <flag name="chromaprint">Enable ChromaPrint / AcoustID support</flag>
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 6180d3cdaa52..a13355a67815 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -3,5 +3,5 @@ AUX musescore-3.6.1-rename-audioitem.patch 491 BLAKE2B 9ecdccb1e3aec15c7233baaeb
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
 EBUILD musescore-3.6.2-r1.ebuild 3058 BLAKE2B 5352d979ff5f5f7a704f589f747d8a04900976e8da82b62cd9d65de6feede64bd78d604f38264c1a3302b3084c9a00a14f542a0c3ecbfa08d5d07bf3e8b143fe SHA512 2f07e56fe6d81bc00590839d2d5a1f30bea863a5d36aa9c5ae159b8719f39abafe08edde4a43683c24c6bf67962a2dc67696921a0a7e5d458cbfdf10f6fdf525
-EBUILD musescore-9999.ebuild 3197 BLAKE2B c56126777d356fc661b95de37a48d53ba46732d293cd230bc733d885388e7e83fe2d3141fa8d8ca31c184046536cbe392066e26bc1d7f701c25305a6fa868ea7 SHA512 13a3035263637873728f1e2550442a54856fbc05233a20f570014de1f401181638402e2a5444e59d120acf1a8f5477225ba88c7ebfb3c8d33bb8155b3883bb06
+EBUILD musescore-9999.ebuild 3223 BLAKE2B 89a6c6bc42275270f18e343796623466e75e20b9e2fd1bc7ac6efbf169c135c6baa3c9daf41d46eebd25ce655b1186c516d74aa94bc26c41c0b1c9ed42b15914 SHA512 01958e0672106c38741229d2c1f391adc378a88b3546009ce0f2b9ccdbc09a89d65ac07e76d4a607f6ff9eba68189c6ef136895abc99f92ba7d0a84776da0e38
 MISC metadata.xml 882 BLAKE2B a8ead5437d77a6c39262770afc3409f3a68072fbc796af0b029641126521299e45e921a666b97b168de79b92d3359ecd4032e26fca798188fa9bd503f394db5a SHA512 4146e03299dd9a646e713dc9baacdba9578c5fb204eeeb81397e25fe5d7b19ae07aa1bb0c550ffff5cb53194f9ee53d0b35fbc26b04658d0e50f08e1a0e441f7
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 2cfc1a6e6ba3..5690f140a41f 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -43,6 +43,7 @@ DEPEND="
 	dev-qt/qtnetworkauth:5
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols:5
 	dev-qt/qtquickcontrols2:5
 	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
 	dev-qt/qtsvg:5
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index e4e722b5875c..fc325122e095 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -3,4 +3,4 @@ DIST ncmpcpp-0.9.2.tar.bz2 486266 BLAKE2B 160597493b93bac790b8619881e8a1fcf0efce
 EBUILD ncmpcpp-0.9.2-r2.ebuild 1455 BLAKE2B 9c12dd5e51980975c864c080663eb9f6488c9d82a64847fa110458bc8f1b61bf0ffc8ecda3f6042afc424c4ba3f5b6c89b8d4fd056dd8b72209ded67111ad0ce SHA512 a53e0ea0cf6b1860d55cad47919645f6d12db8986469fecdde51f38ba6ccced770d747042dc72981822b29c4788fcb1e43c36559d8afda543a24e37478449439
 EBUILD ncmpcpp-0.9.2-r3.ebuild 1537 BLAKE2B 50eb220f61551c2310e8f228d2a91e26a54d42e92606a2002d93e43d3614e0f6d25a3bc267dbc8b255607d39c41a7e544e690d1583f73b2d740c6c30c28eec44 SHA512 bfbbd0ff3c89183887c15cf9c07cb7525c24d7843a5eb10e0bb581076c29e77b0f1688a3fe5371319d24e70779703acb2caa52b4affbbba9814f0f302c707462
 EBUILD ncmpcpp-9999.ebuild 1427 BLAKE2B 6041fc0d24bb4699badee97b67f4c282eb1519478c5a7231d5d5466f2609285a750fbe13f58819df35da83ef966d6d034dfbba5ecaa840eafbc91d5574c7cf3d SHA512 fc5d4eb76d74856700d57f6fa1cb8f3d2c97b7e736cd528b3d1d3baecf3de4209e7eb051090bcedcc8f40d99ec7a69927a7b78f051bb25dac1337f1f6a2254cb
-MISC metadata.xml 1075 BLAKE2B a59dee89badf46d387b0c8b505ef73c98c38804591ae55dc8c653d45e8cf55788eb3dfbc6bfca8eb67b03c6cb9a277f8b6b245245e4550a590e00e20eecbfc24 SHA512 254212be74cfc2af51c8f3afff0aa2ff14e34030b1117c868ea1a764e87aa0e7bf151c78e20141698edd578e7323804c017c29b497daee29082a5a61f18d7194
+MISC metadata.xml 1358 BLAKE2B d953e469fce438b4d98d2006891bd6167f69e88467e003abd8be6dc1a0ec78089d45208a8d2c2a696028a412d0dec8987c2f0bd39e3b46bffba43b07f7139665 SHA512 15fff875a88001343c7fa053f4cff8704a1fe2c8e8021bba74d19ee4a2e08740aff67426cdf17f909b7a2e22a25c86eadca200d329cde6848c606575009b7a0c
diff --git a/media-sound/ncmpcpp/metadata.xml b/media-sound/ncmpcpp/metadata.xml
index 81e93ba0c867..8487c821da85 100644
--- a/media-sound/ncmpcpp/metadata.xml
+++ b/media-sound/ncmpcpp/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>nex+b-g-o@nexadn.de</email>
+		<name>Adrian Schollmeyer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="clock">Enable clock screen</flag>
 		<flag name="lto">Build with link-time optimisation</flag>
@@ -27,4 +34,7 @@
 		* ability to browse and add files from outside of MPD music directory
 		..and a lot more minor convenient functions.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">ncmpcpp/ncmpcpp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/ncspot/Manifest b/media-sound/ncspot/Manifest
index 97ba3651d37d..79c084c0b6ba 100644
--- a/media-sound/ncspot/Manifest
+++ b/media-sound/ncspot/Manifest
@@ -384,5 +384,5 @@ DIST xi-unicode-0.3.0.crate 87001 BLAKE2B 1d44488a32dc9bd9284df6ee26f0f05c5145c4
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
 DIST zerocopy-0.6.1.crate 23933 BLAKE2B 322a1a74a436c89a6a84addd55a0347b087e416fb532dea9344e85af398c869233446e2f3824612313783919c8b9a0a96d0c64c1ca0403ef386bcab6ca9682f0 SHA512 af241a21208dc33f69d92bc01fb15feea3cab8bbd0fe0076d5ac15fdd65458d1ddd69d3e88b1dc27ae9774acee7ae6952c16372b5aad50190f488aedfd6f6629
 DIST zerocopy-derive-0.3.2.crate 515746 BLAKE2B bb3e7703532c1333ab60033717a2d43e4a014bdb53e15b0beed949005ff6a9eea9ae9012a9721815fd2b2f3fc61abe23b550e395714e8d309a6bddbd897b743c SHA512 daafee42d2f46971a8a8488554e5859cedeed5b3555dea37eb34ef89a6d36adac37922c90095575a29ba1f099722a35cf35c67ec2fad1f172921bd0a087c4400
-EBUILD ncspot-0.12.0.ebuild 8921 BLAKE2B 36affda35c5cb2bc5f9332d4ace6fb3ff6dc9052f11db48328d52515b2fa0cc466fcb4707cc680d626fc5318265de27acf44c4a5d2fa4f35a4376f116cf96bda SHA512 ce239c3dc94d7789499fc3aeb21918c56b08a5ed450284ef13c1f07d657536ac149ec8c22fea84235c17fe05c99ba50563c85a5eafc829cf5f78f300dd336f39
+EBUILD ncspot-0.12.0.ebuild 8921 BLAKE2B 9280546f49caff553ec1e105ac0ecdda449640b365d2c9acb97e1ff10108839c190bd5d5ba7c03794f6da724853f43d788827d91052ea4666d54820282248dad SHA512 8fa7fa981adf2793cad5f67008c0b6e74816da11f196568db3ea7f9ec114493077ab9b052ecb9c04f8aec8c40bdf1ed7c59d9c375d7964d9136fdcd132e288a8
 MISC metadata.xml 611 BLAKE2B 3cace487e7141c6d0853d25f20c145d77d0616541358418677ecf1b53aa79d9cbfe57c68f0a24eaa000cf79f4bcb721c899baa8747f251b349ebefa20da3bc7e SHA512 ff2478e44627a18d88410f85b4d354763fecb83ce8c5094afd04426ffedd207b13816204738b94835625fe44dd5fda17fd73f79e59a1f057e06df7b0438f836d
diff --git a/media-sound/ncspot/ncspot-0.12.0.ebuild b/media-sound/ncspot/ncspot-0.12.0.ebuild
index 243cf5d493c2..4ef95b901854 100644
--- a/media-sound/ncspot/ncspot-0.12.0.ebuild
+++ b/media-sound/ncspot/ncspot-0.12.0.ebuild
@@ -452,5 +452,5 @@ src_install() {
 
 pkg_postinst() {
 	optfeature_header "Optional runtime features:"
-	optfeature "media-sound/rescrobbled" MPRIS song scrobbling support
+	optfeature "MPRIS song scrobbling support" media-sound/rescrobbled
 }
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 78be6e83424c..140bbf0f2d24 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 6876ff48e760..04ca32f8565d 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 14 Jan 2023 17:09:52 +0000
+Sat, 14 Jan 2023 23:09:53 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index d48e8a181b61..4aafbf193873 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-01-14T17:09:56Z
+TIMESTAMP 2023-01-14T23:09:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPC4eRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPDNkVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDYbg/+PmygGLuYIip5cWDl36Rb2oe3ZPGYlBdjSBsHXKVTZ24WwZqEUyE43hMu
-btGTiM9hyiMYJrR+plim7Xl3n98mIqBTn+BPNTKiTyTTpxmuf8HLUe7EqI58Eftx
-+0HPh/zziZEztiTJh4+ydX24FLerD8STlXPIIkI21t/01tbKJsbSrj/wV0HgFGEx
-0FfeZxi9T9k9osuufRSZTL5QCT1/ywGaTlquKQWjotxVmN535joMQs80Ya9kdlse
-BeSjgFXpyvizscBI07v0UB/U1Sqn/oHwVwOw4bush7iSm2TsGcdk5aedAU8LYT41
-DWUTDCaQXCCPTlU6vsDzX0RWzZBL6JZSAXwCBYXX9f+uNZYPP0XcH8z46ttTUy1H
-g4Ps2tLkog1YA1BLPr1iYIR/tcYX6w/M7oh6vdJPL+9dzXo/JCEQ7nMkEmABTBFJ
-KXeDruAUPYqGkiFFkA+WBwjYI+AJeFRmYv9pEAOqFggEwxgNXU1K+5QadxkVhsfc
-wXHC4NvVKqDCmuu+9q00WsWGOVRj3NOZjVv8P4BQ11RUopbbUzt4TnJe0UNjNaGG
-Q0YWScA+xG4cAdz250uczEii30fAnj82K73Uma3Sp9+a4I+pFTF+K+3PMm7o72yj
-jxCRXuCB8BCPuNmUEYxr40dX7TJ8OCA053mtWIVpvAiKqR09FuM=
-=e/6Z
+klDxLg/9E3mDU5xJ2AKawClhbDThnJJhUJmTpLbCDKRbqwqAoZmOLWFW9DlbfuiQ
+MDTqb+2f8a9Shlu48Kv712H1VOsEX1mSQ3jct437Bm6pGvnWvY71CGa0EebVPSSQ
+ZD7iCjYH02Unkh+AkgJCe9/GJAOpBSJqnO7xwmuCj2u0vD0d12YqkSW6ruh968SH
+7d6tunpnLo05E32cEU0fsd+AoNlcaYOzaSuFTReAUfi5SVXKZQn4PCxPrgpKChyA
+IQnvepPrAEF3MqiB0HX1ppjvjEbb555vJmOTmGrCIJW1cBk+mHLfn52R3p7fSvAN
+UpwvXgurd/QBwhTcUXyDtb8bb5fk/dj6dorBCtlEphNDkit5pe34Aa2owKB9kNz5
+k0eU1QcwPFd2an+ZdXixoibh1th4+r690NE7OJwdfPmkq7j8vJBPnI4kzpZoO1dA
+p1/0MZnfyZUxyDi8qsZIxhN8anFy7ll9cVE1Lovyw9O613qFXCoUTweJc0Avi5sm
+g0VJKplKr2kL/gncdA6u4miaRRc3CQl/ZgWK0ZSn9ogZskIiP3WSaDtWVeGseGRr
+SeopYOxkSmXeZ53Nv6GM1cwmSK3NMmtTV8BCr6ub2Zzye9eN0d6e9tgCBdDSWHtn
+Xgej5VUrCIpTX08zbFjSivkj2xjMWxfdn4IZ4fYBovnY4edqHuE=
+=AA3j
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 6876ff48e760..04ca32f8565d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 14 Jan 2023 17:09:52 +0000
+Sat, 14 Jan 2023 23:09:53 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 2e682455da26..6c143d87db3f 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index ff69df0ec5ae..f47109f52108 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/dpkg-1.21.18 b/metadata/md5-cache/app-arch/dpkg-1.21.18
new file mode 100644
index 000000000000..940c4591b136
--- /dev/null
+++ b/metadata/md5-cache/app-arch/dpkg-1.21.18
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=app-arch/gzip-1.7 >=app-arch/tar-1.34-r1 app-crypt/libmd >=dev-lang/perl-5.14.2:= sys-libs/ncurses:=[unicode(+)] bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= ) app-arch/xz-utils virtual/pkgconfig test? ( dev-perl/IO-String dev-perl/Test-Pod virtual/perl-Test-Harness )
+DESCRIPTION=Package maintenance system for Debian
+EAPI=8
+HOMEPAGE=https://packages.qa.debian.org/dpkg
+INHERIT=autotools toolchain-funcs
+IUSE=+bzip2 +lzma nls selinux static-libs test +update-alternatives +zlib +zstd
+LICENSE=GPL-2+
+RDEPEND=>=app-arch/gzip-1.7 >=app-arch/tar-1.34-r1 app-crypt/libmd >=dev-lang/perl-5.14.2:= sys-libs/ncurses:=[unicode(+)] bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.21.18.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=861e5a98ae73bd0bf9efa7368728fe3f
diff --git a/metadata/md5-cache/app-arch/gzip-1.12-r3 b/metadata/md5-cache/app-arch/gzip-1.12-r4
index 19344f160c15..9170a0ce3914 100644
--- a/metadata/md5-cache/app-arch/gzip-1.12-r3
+++ b/metadata/md5-cache/app-arch/gzip-1.12-r4
@@ -12,4 +12,4 @@ RDEPEND=!app-arch/pigz[symlink(-)]
 SLOT=0
 SRC_URI=mirror://gnu/gzip/gzip-1.12.tar.xz https://alpha.gnu.org/gnu/gzip/gzip-1.12.tar.xz verify-sig? ( mirror://gnu/gzip/gzip-1.12.tar.xz.sig https://alpha.gnu.org/gnu/gzip/gzip-1.12.tar.xz.sig )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a025efcda4927de0772c78b92ad5c4cf
+_md5_=22ab59cf055bedd09d72a4daa3260ae8
diff --git a/metadata/md5-cache/app-arch/gzip-1.12_p20221228 b/metadata/md5-cache/app-arch/gzip-1.12_p20221228-r1
index 8d95b9a7bd7e..6e24e6afedcb 100644
--- a/metadata/md5-cache/app-arch/gzip-1.12_p20221228
+++ b/metadata/md5-cache/app-arch/gzip-1.12_p20221228-r1
@@ -11,4 +11,4 @@ RDEPEND=!app-arch/pigz[symlink(-)]
 SLOT=0
 SRC_URI=https://meyering.net/gzip/gzip-1.12.31-7553.tar.xz -> gzip-1.12_p20221228.tar.xz verify-sig? ( https://meyering.net/gzip/gzip-1.12.31-7553.tar.xz.sig -> gzip-1.12_p20221228.tar.xz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=b7c3f0c81349d22accfd07320e22fbe2
+_md5_=8fd47bd50438a68dab3d28609abecc67
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index a3075abc347f..b9e618a17838 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/ccid-1.5.0 b/metadata/md5-cache/app-crypt/ccid-1.5.0
index f6e0b5f0cb1a..38c9e1bf4238 100644
--- a/metadata/md5-cache/app-crypt/ccid-1.5.0
+++ b/metadata/md5-cache/app-crypt/ccid-1.5.0
@@ -1,5 +1,5 @@
 BDEPEND=kernel_linux? ( virtual/pkgconfig ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install
+DEFINED_PHASES=compile configure install postinst postrm
 DEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
 DESCRIPTION=CCID free software driver
 EAPI=8
@@ -12,4 +12,4 @@ RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
 SLOT=0
 SRC_URI=https://ccid.apdu.fr/files/ccid-1.5.0.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=73596fa7a173478f05ba2161d876d999
+_md5_=bcab0b9c25c12f87f98e753467a4f894
diff --git a/metadata/md5-cache/app-crypt/rhash-1.4.2 b/metadata/md5-cache/app-crypt/rhash-1.4.2
index c6214026e283..b32157c3a3ea 100644
--- a/metadata/md5-cache/app-crypt/rhash-1.4.2
+++ b/metadata/md5-cache/app-crypt/rhash-1.4.2
@@ -4,12 +4,12 @@ DEPEND=ssl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 DESCRIPTION=Console utility and library for computing and verifying file hash sums
 EAPI=7
 HOMEPAGE=http://rhash.sourceforge.net/
-INHERIT=toolchain-funcs multilib-minimal
+INHERIT=flag-o-matic toolchain-funcs multilib-minimal
 IUSE=debug nls ssl 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
 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=MIT
 RDEPEND=ssl? ( dev-libs/openssl: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(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/rhash/rhash-1.4.2-src.tar.gz
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=7c9d1ee379df1dff273835efa0825f7b
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=e4a7cc84ffe1f76810f661d91de143af
diff --git a/metadata/md5-cache/app-crypt/rhash-1.4.3 b/metadata/md5-cache/app-crypt/rhash-1.4.3
index 719620a71026..98770aac1e01 100644
--- a/metadata/md5-cache/app-crypt/rhash-1.4.3
+++ b/metadata/md5-cache/app-crypt/rhash-1.4.3
@@ -4,12 +4,12 @@ DEPEND=ssl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 DESCRIPTION=Console utility and library for computing and verifying file hash sums
 EAPI=8
 HOMEPAGE=http://rhash.sourceforge.net/
-INHERIT=toolchain-funcs multilib-minimal
+INHERIT=flag-o-matic toolchain-funcs multilib-minimal
 IUSE=debug nls ssl 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
 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=MIT
 RDEPEND=ssl? ( dev-libs/openssl: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(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/rhash/rhash-1.4.3-src.tar.gz
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=87045e3be81ce5b471448dcdc74ff024
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=729583d3350eef8a9555935fe6b8dbcd
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 647cdcda85a0..0eb545954a05 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/evtest-1.35 b/metadata/md5-cache/app-misc/evtest-1.35
index 6f02093c9e0f..31b3e9c0275c 100644
--- a/metadata/md5-cache/app-misc/evtest-1.35
+++ b/metadata/md5-cache/app-misc/evtest-1.35
@@ -4,9 +4,9 @@ DESCRIPTION=test program for capturing input device events
 EAPI=8
 HOMEPAGE=https://cgit.freedesktop.org/evtest/
 INHERIT=autotools
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/libevdev/evtest/-/archive/evtest-1.35/evtest-evtest-1.35.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=4d92ed0251204732a7dc26412f31c467
+_md5_=b85c80ad69ceaf95013c7da93d73617c
diff --git a/metadata/md5-cache/app-misc/liquidctl-1.12.0 b/metadata/md5-cache/app-misc/liquidctl-1.12.1
index 3f683b71fc99..095328ea7913 100644
--- a/metadata/md5-cache/app-misc/liquidctl-1.12.0
+++ b/metadata/md5-cache/app-misc/liquidctl-1.12.1
@@ -11,6 +11,6 @@ RDEPEND=dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/liquidctl/liquidctl/releases/download/v1.12.0/liquidctl-1.12.0.tar.gz
+SRC_URI=https://github.com/liquidctl/liquidctl/releases/download/v1.12.1/liquidctl-1.12.1.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=885c4dfbd335f96310e196a7613abd9e
+_md5_=94521884b1fbe922c58b35368b8d0a9e
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 0505de8dfe72..fd38d73c4f0e 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/pycargoebuild-0.6.1 b/metadata/md5-cache/app-portage/pycargoebuild-0.6.1
new file mode 100644
index 000000000000..fda38355b786
--- /dev/null
+++ b/metadata/md5-cache/app-portage/pycargoebuild-0.6.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A generator for Rust/Cargo ebuilds written in Python
+EAPI=8
+HOMEPAGE=https://github.com/projg2/pycargoebuild/ https://pypi.org/project/pycargoebuild/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/projg2/pycargoebuild/archive/v0.6.1.tar.gz -> pycargoebuild-0.6.1.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=f4688bdc0fdc7705fe7400184ef2deba
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 719cf47dbbe1..8f7f24e84cfb 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/libgpr-22.0.0-r1 b/metadata/md5-cache/dev-ada/libgpr-22.0.0-r1
index b965bc23b4b9..33c9a80fc277 100644
--- a/metadata/md5-cache/dev-ada/libgpr-22.0.0-r1
+++ b/metadata/md5-cache/dev-ada/libgpr-22.0.0-r1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 INHERIT=ada multiprocessing
 IUSE=+shared static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-ada/xmlada:=[shared?,static-libs?,static-pic?,ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
 REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 ) || ( shared static-libs static-pic )
 SLOT=0/22.0.0
 SRC_URI=https://github.com/AdaCore/gprbuild/archive/refs/tags/v22.0.0.tar.gz -> gprbuild-22.0.0.tar.gz
 _eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=f8837d0ecc0b7745567671ec6dab363e
+_md5_=d752c688ccaf156eb87685c64e5ce7a5
diff --git a/metadata/md5-cache/dev-ada/libgpr-23.0.0 b/metadata/md5-cache/dev-ada/libgpr-23.0.0
index f1825046e08c..bca7723214d5 100644
--- a/metadata/md5-cache/dev-ada/libgpr-23.0.0
+++ b/metadata/md5-cache/dev-ada/libgpr-23.0.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 INHERIT=ada multiprocessing
 IUSE=+shared static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-ada/xmlada:=[shared?,static-libs?,static-pic?,ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
 REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 ) || ( shared static-libs static-pic )
 SLOT=0/23.0.0
 SRC_URI=https://github.com/AdaCore/gprbuild/archive/refs/tags/v23.0.0.tar.gz -> gprbuild-23.0.0.tar.gz
 _eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=f8837d0ecc0b7745567671ec6dab363e
+_md5_=d752c688ccaf156eb87685c64e5ce7a5
diff --git a/metadata/md5-cache/dev-ada/xmlada-2021-r1 b/metadata/md5-cache/dev-ada/xmlada-2021-r1
deleted file mode 100644
index ca4c209a639b..000000000000
--- a/metadata/md5-cache/dev-ada/xmlada-2021-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)]
-DESCRIPTION=Set of modules that provide a simple manipulation of XML streams
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/
-INHERIT=ada multiprocessing
-IUSE=+shared static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] )
-REQUIRED_USE=|| ( shared static-libs static-pic ) ada_target_gnat_2021
-SLOT=0
-SRC_URI=https://community.download.adacore.com/v1/6a2cf72f308cc787926b12ddc20993fcf2b8ea79?filename=xmlada-2021-20210518-19D50-src.tar.gz -> xmlada-2021-20210518-19D50-src.tar.gz
-_eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=34aa9dedad7cd53ee48e8bb2b76c67fc
diff --git a/metadata/md5-cache/dev-ada/xmlada-2021-r2 b/metadata/md5-cache/dev-ada/xmlada-2021-r2
deleted file mode 100644
index 364596e98532..000000000000
--- a/metadata/md5-cache/dev-ada/xmlada-2021-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)]
-DESCRIPTION=Set of modules that provide a simple manipulation of XML streams
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/
-INHERIT=ada multiprocessing
-IUSE=+shared static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] )
-REQUIRED_USE=|| ( shared static-libs static-pic ) ada_target_gnat_2021
-SLOT=0
-SRC_URI=https://community.download.adacore.com/v1/6a2cf72f308cc787926b12ddc20993fcf2b8ea79?filename=xmlada-2021-20210518-19D50-src.tar.gz -> xmlada-2021-20210518-19D50-src.tar.gz
-_eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=34b5820beede80fda27e6ec5cdc5909d
diff --git a/metadata/md5-cache/dev-ada/xmlada-22.0.0 b/metadata/md5-cache/dev-ada/xmlada-22.0.0
index 8227de6a1fb8..3af779024b76 100644
--- a/metadata/md5-cache/dev-ada/xmlada-22.0.0
+++ b/metadata/md5-cache/dev-ada/xmlada-22.0.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 INHERIT=ada multiprocessing
 IUSE=+shared static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
 REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
 SLOT=0/22.0.0
 SRC_URI=https://github.com/AdaCore/xmlada/archive/refs/tags/v22.0.0.tar.gz -> xmlada-22.0.0.tar.gz
 _eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=74f10866ed917c95016928eab8f67c69
+_md5_=61558fd1164978b40b3034f67aaaaa56
diff --git a/metadata/md5-cache/dev-ada/xmlada-23.0.0 b/metadata/md5-cache/dev-ada/xmlada-23.0.0
index afbb0aafab15..e287ebf25cd4 100644
--- a/metadata/md5-cache/dev-ada/xmlada-23.0.0
+++ b/metadata/md5-cache/dev-ada/xmlada-23.0.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 INHERIT=ada multiprocessing
 IUSE=+shared static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
 REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
 SLOT=0/23.0.0
 SRC_URI=https://github.com/AdaCore/xmlada/archive/refs/tags/v23.0.0.tar.gz -> xmlada-23.0.0.tar.gz
 _eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=09ff2a7461151fdb80670d3347ad1b02
+_md5_=ea99c18e4c36a2204b402a761219d288
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 0313d023905a..8838f18674c5 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/recastnavigation-1.5.1_p20230102 b/metadata/md5-cache/dev-games/recastnavigation-1.5.1_p20230102
new file mode 100644
index 000000000000..93335084084d
--- /dev/null
+++ b/metadata/md5-cache/dev-games/recastnavigation-1.5.1_p20230102
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-cpp/catch:0 )
+DESCRIPTION=Navigation mesh construction toolset for games
+EAPI=8
+HOMEPAGE=https://github.com/recastnavigation/recastnavigation
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=ZLIB
+RESTRICT=!test? ( test )
+SLOT=0/1.5.1
+SRC_URI=https://github.com/recastnavigation/recastnavigation/archive/405cc095ab3a2df976a298421974a2af83843baf.tar.gz -> recastnavigation-1.5.1_p20230102.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f240f96eb24c42ed3dac2c3d0ebe4812
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 34899a8481e4..89dba8755975 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/protobuf-java-9999 b/metadata/md5-cache/dev-java/protobuf-java-9999
deleted file mode 100644
index 053e62fb4a0e..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-9999
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/protobuf:0/32 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=8
-HOMEPAGE=https://developers.google.com/protocol-buffers/
-INHERIT=edo java-pkg-2 java-pkg-simple git-r3
-IUSE=doc source test
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0/32
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	2347f8fe2d392b2a091191f94be37e6f	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=4666ff7d56a6a245189253cd90fa190b
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index caaa8d1f7036..9993528af8ce 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/zig-0.10.0 b/metadata/md5-cache/dev-lang/zig-0.10.0-r1
index d1afaa6a16a6..024d05c01838 100644
--- a/metadata/md5-cache/dev-lang/zig-0.10.0
+++ b/metadata/md5-cache/dev-lang/zig-0.10.0-r1
@@ -4,11 +4,11 @@ DEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd] !!sys-deve
 DESCRIPTION=A robust, optimal, and maintainable programming language
 EAPI=8
 HOMEPAGE=https://ziglang.org/
-INHERIT=cmake llvm check-reqs
+INHERIT=edo cmake llvm check-reqs
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=MIT
 RDEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd] !dev-lang/zig-bin
 SLOT=0
 SRC_URI=https://ziglang.org/download/0.10.0/zig-0.10.0.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=44541af44998b433907d8030954ce805
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=efe6b2b123c59b7b7c50e72a080a48fc
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index ae0420906b5d..69edf246b262 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/libgcrypt-1.10.1-r2 b/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r2
index 66485ab565ac..c91a158a7551 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r2
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r2
@@ -13,4 +13,4 @@ REQUIRED_USE=cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) cpu_fl
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.10.1.tar.bz2 verify-sig? ( mirror://gnupg/libgcrypt/libgcrypt-1.10.1.tar.bz2.sig )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=64fe4a96daac4647fc028a76b44da817
+_md5_=e505c7892d8014ba173d56b1aee220e3
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r3 b/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r3
index 6a6702e25b7e..065f17aa7266 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r3
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r3
@@ -13,4 +13,4 @@ REQUIRED_USE=cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) cpu_fl
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.10.1.tar.bz2 verify-sig? ( mirror://gnupg/libgcrypt/libgcrypt-1.10.1.tar.bz2.sig )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e10c017b28fb739046469b2dbf8633d3
+_md5_=8beb02e43c8bef776579f0031f203e3a
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.9.4-r2 b/metadata/md5-cache/dev-libs/libgcrypt-1.9.4-r2
index 90f356eb9513..f17bf8c8cee3 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.9.4-r2
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.9.4-r2
@@ -13,4 +13,4 @@ REQUIRED_USE=cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) cpu_fl
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.9.4.tar.bz2 verify-sig? ( mirror://gnupg/libgcrypt/libgcrypt-1.9.4.tar.bz2.sig )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a5339c8cdd2a74e5d2222cff4a027ac3
+_md5_=4e436f0a309758df3de9b6feea0b1855
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.10.3-r1 b/metadata/md5-cache/dev-libs/libxml2-2.10.3-r1
index 84aa483c0b6f..c62807706f80 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.10.3-r1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.10.3-r1
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 DESCRIPTION=XML C parser and toolkit
 EAPI=8
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
-INHERIT=flag-o-matic python-r1 multilib-minimal gnome.org libtool
+INHERIT=flag-o-matic python-r1 multilib-minimal toolchain-funcs gnome.org libtool
 IUSE=debug examples +ftp icu lzma +python readline static-libs test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 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=MIT
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libxml2/2.10/libxml2-2.10.3.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=39ed6149f87a599cbd3544fafe3e6781
+_md5_=e08523f2963aa5fa5386a5a0a953249b
diff --git a/metadata/md5-cache/dev-libs/libxml2-9999 b/metadata/md5-cache/dev-libs/libxml2-9999
index 1bf1d89838a0..b1784ccda343 100644
--- a/metadata/md5-cache/dev-libs/libxml2-9999
+++ b/metadata/md5-cache/dev-libs/libxml2-9999
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 DESCRIPTION=XML C parser and toolkit
 EAPI=8
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
-INHERIT=flag-o-matic python-r1 multilib-minimal autotools git-r3
+INHERIT=flag-o-matic python-r1 multilib-minimal toolchain-funcs autotools git-r3
 IUSE=debug examples +ftp icu lzma +python readline static-libs test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=a09f46a97519fa68a6f1a684e1783e2e
+_md5_=e81a93d14fa1e5faf202d2c07ba805e1
diff --git a/metadata/md5-cache/dev-libs/npth-1.6-r1 b/metadata/md5-cache/dev-libs/npth-1.6-r1
index 49cd4ad6f257..b6e0d2c54d5b 100644
--- a/metadata/md5-cache/dev-libs/npth-1.6-r1
+++ b/metadata/md5-cache/dev-libs/npth-1.6-r1
@@ -3,12 +3,12 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=New GNU Portable Threads Library
 EAPI=7
 HOMEPAGE=https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git
-INHERIT=autotools
+INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=test
 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=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnupg/npth/npth-1.6.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1b5c9456a88f59c577143aca40f2a76f
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=5d65200770a0b422487df5e6d2add1b2
diff --git a/metadata/md5-cache/dev-libs/popt-1.18 b/metadata/md5-cache/dev-libs/popt-1.18
index c5ce83666cb2..b6ee1a943611 100644
--- a/metadata/md5-cache/dev-libs/popt-1.18
+++ b/metadata/md5-cache/dev-libs/popt-1.18
@@ -4,12 +4,12 @@ DEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 DESCRIPTION=Parse Options - Command line parser
 EAPI=7
 HOMEPAGE=https://github.com/rpm-software-management/popt
-INHERIT=multilib-minimal libtool
+INHERIT=flag-o-matic multilib-minimal libtool toolchain-funcs
 IUSE=nls 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
 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=MIT
 RDEPEND=nls? ( >=virtual/libintl-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(-)?] )
 SLOT=0
 SRC_URI=http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=fe146e40da9fbcbb7486b779a6170777
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=43b054a5fceeba73c432191f5e2273e1
diff --git a/metadata/md5-cache/dev-libs/popt-1.19 b/metadata/md5-cache/dev-libs/popt-1.19
index 41b940e4b493..d30f6c51d41d 100644
--- a/metadata/md5-cache/dev-libs/popt-1.19
+++ b/metadata/md5-cache/dev-libs/popt-1.19
@@ -4,12 +4,12 @@ DEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 DESCRIPTION=Parse Options - Command line parser
 EAPI=8
 HOMEPAGE=https://github.com/rpm-software-management/popt
-INHERIT=multilib-minimal libtool
+INHERIT=flag-o-matic multilib-minimal libtool toolchain-funcs
 IUSE=nls 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
 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=MIT
 RDEPEND=nls? ( >=virtual/libintl-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(-)?] )
 SLOT=0
 SRC_URI=http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.19.tar.gz
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ddae5a574ea03fc07407e963d43ac7ab
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=e075a7a031722547b5826ee4045f23ae
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 4ef092a7c4c5..48a2958dfeff 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/lxml-4.9.1 b/metadata/md5-cache/dev-python/lxml-4.9.1
deleted file mode 100644
index 2e1164ab02ce..000000000000
--- a/metadata/md5-cache/dev-python/lxml-4.9.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-python/cython-0.29.29[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/docutils[python_targets_python3_11(-)] dev-python/pygments[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/docutils[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/docutils[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.10-r1:0 dev-python/docutils[python_targets_pypy3(-)] dev-python/pygments[python_targets_pypy3(-)] dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( dev-python/cssselect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libxml2-2.9.12-r2 >=dev-libs/libxslt-1.1.28
-DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
-EAPI=8
-HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml
-INHERIT=distutils-r1 optfeature toolchain-funcs
-IUSE=doc examples +threads test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD ElementTree GPL-2 PSF-2
-RDEPEND=>=dev-libs/libxml2-2.9.12-r2 >=dev-libs/libxslt-1.1.28 python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.9.1.tar.gz -> lxml-4.9.1.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=0c56fdf3065b2023975957239de3c53e
diff --git a/metadata/md5-cache/dev-python/yaxmldiff-0.1.0 b/metadata/md5-cache/dev-python/yaxmldiff-0.1.0
index 751ea75e1d39..f5b77de6e311 100644
--- a/metadata/md5-cache/dev-python/yaxmldiff-0.1.0
+++ b/metadata/md5-cache/dev-python/yaxmldiff-0.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/yaxmldiff/ https://github.com/latk/yaxmldiff.py
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~loong ~x86
+KEYWORDS=amd64 ~loong ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/latk/yaxmldiff.py/archive/refs/tags/v0.1.0.tar.gz -> yaxmldiff-0.1.0.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=05ebcebe1d3941e8abda6ec3be67c21c
+_md5_=9be547e55091629ae9dc6cac4f93f94c
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index a612b415d815..4f32f2d1601f 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/gcovr-5.2 b/metadata/md5-cache/dev-util/gcovr-5.2
index f23646a14509..a26f46aad0d0 100644
--- a/metadata/md5-cache/dev-util/gcovr-5.2
+++ b/metadata/md5-cache/dev-util/gcovr-5.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gcovr/gcovr
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~loong ~x86
+KEYWORDS=amd64 ~loong ~x86
 LICENSE=BSD
 RDEPEND=dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/yaxmldiff[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gcovr/gcovr/archive/5.2.tar.gz -> gcovr-5.2.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=a845acccbffa4064fab5013fa073989f
+_md5_=3ec01797006844f5f5ed0d52b80853ef
diff --git a/metadata/md5-cache/dev-util/makeheaders-0_p4 b/metadata/md5-cache/dev-util/makeheaders-0_p4
deleted file mode 100644
index 5d1991de86f7..000000000000
--- a/metadata/md5-cache/dev-util/makeheaders-0_p4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=simple utility that will automatically generate header files
-EAPI=6
-HOMEPAGE=http://www.hwaci.com/sw/mkhdr/
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=http://www.hwaci.com/sw/mkhdr/makeheaders.c -> makeheaders-0_p4.c http://www.hwaci.com/sw/mkhdr/makeheaders.html -> makeheaders-0_p4.html
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=2f7cf0c64c8492ab06e2b6533c6b54ca
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index e7ef0f07e5c3..e63cdb40bab9 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/imapfilter-2.8.1 b/metadata/md5-cache/mail-filter/imapfilter-2.8.1
new file mode 100644
index 000000000000..6ac5b1efa1b6
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/imapfilter-2.8.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=dev-libs/openssl:= dev-libs/libpcre2 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 )
+DESCRIPTION=An IMAP mail filtering utility
+EAPI=8
+HOMEPAGE=https://github.com/lefcha/imapfilter
+INHERIT=lua-single toolchain-funcs
+IUSE=lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/openssl:= dev-libs/libpcre2 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 )
+REQUIRED_USE=^^ ( 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/lefcha/imapfilter/archive/v2.8.1.tar.gz -> imapfilter-2.8.1.tar.gz
+_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=11ec35c36e979434016559626a16fdeb
diff --git a/metadata/md5-cache/mate-base/Manifest.gz b/metadata/md5-cache/mate-base/Manifest.gz
index 51b7e34e76c5..078191381e28 100644
--- a/metadata/md5-cache/mate-base/Manifest.gz
+++ b/metadata/md5-cache/mate-base/Manifest.gz
diff --git a/metadata/md5-cache/mate-base/caja-1.26.1 b/metadata/md5-cache/mate-base/caja-1.26.1
new file mode 100644
index 000000000000..8646d858b938
--- /dev/null
+++ b/metadata/md5-cache/mate-base/caja-1.26.1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk ) >=dev-libs/glib-2.58.1:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.17.3:0 >=media-libs/libexif-0.6.14:0 virtual/libintl x11-libs/cairo >=x11-libs/gdk-pixbuf-2.36.5:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/libnotify-0.7.0:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender >=x11-libs/pango-1.1.2 introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) xmp? ( >=media-libs/exempi-1.99.5:2= ) >=dev-lang/perl-5:= dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info >=mate-base/mate-common-1.26
+DESCRIPTION=Caja file manager for the MATE desktop
+EAPI=7
+HOMEPAGE=https://mate-desktop.org
+INHERIT=mate
+IUSE=+introspection +mate nls xmp
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=mate? ( >=x11-themes/mate-icon-theme-1.26 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.26/caja-1.26.1.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mate	bd950bf2bbeed028fe4898c655edb4ca	mate-desktop.org	e151c24352371540f44e3b71fcc0d6b1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2f65553bba77d76d9b90ff31474e54aa
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index b413c4036a72..6542614f924f 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/musescore-9999 b/metadata/md5-cache/media-sound/musescore-9999
index cf3adc9be41b..f222538ac26d 100644
--- a/metadata/md5-cache/media-sound/musescore-9999
+++ b/metadata/md5-cache/media-sound/musescore-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) omr? ( app-text/poppler ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] )
+DEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) omr? ( app-text/poppler ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] )
 DESCRIPTION=WYSIWYG Music Score Typesetter
 EAPI=8
 HOMEPAGE=https://musescore.org/
@@ -9,10 +9,10 @@ INHERIT=cmake qmake-utils xdg check-reqs git-r3
 IUSE=alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz test webengine
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) omr? ( app-text/poppler ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] )
+RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) omr? ( app-text/poppler ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] )
 REQUIRED_USE=portmidi? ( portaudio )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bd4320fc5220f472900bc54ff7297e90
+_md5_=6c3c72797062472941816430a8b6d1c7
diff --git a/metadata/md5-cache/media-sound/ncspot-0.12.0 b/metadata/md5-cache/media-sound/ncspot-0.12.0
index ef6762211c2c..c0c3ff5b6798 100644
--- a/metadata/md5-cache/media-sound/ncspot-0.12.0
+++ b/metadata/md5-cache/media-sound/ncspot-0.12.0
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/openssl:= media-libs/libpulse sys-apps/dbus sys-libs/ncurses x1
 SLOT=0
 SRC_URI=https://github.com/hrkfdn/ncspot/archive/refs/tags/v0.12.0.tar.gz -> ncspot-0.12.0.tar.gz https://crates.io/api/v1/crates/addr2line/0.19.0/download -> addr2line-0.19.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.6.0/download -> aes-0.6.0.crate https://crates.io/api/v1/crates/aes-ctr/0.6.0/download -> aes-ctr-0.6.0.crate https://crates.io/api/v1/crates/aes-soft/0.6.4/download -> aes-soft-0.6.4.crate https://crates.io/api/v1/crates/aesni/0.10.0/download -> aesni-0.10.0.crate https://crates.io/api/v1/crates/ahash/0.8.2/download -> ahash-0.8.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/alsa/0.6.0/download -> alsa-0.6.0.crate https://crates.io/api/v1/crates/alsa-sys/0.3.1/download -> alsa-sys-0.3.1.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/async-trait/0.1.60/download -> async-trait-0.1.60.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.67/download -> backtrace-0.3.67.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bindgen/0.61.0/download -> bindgen-0.61.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.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/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/bumpalo/3.11.1/download -> bumpalo-3.11.1.crate https://crates.io/api/v1/crates/bytecount/0.6.3/download -> bytecount-0.6.3.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.3.0/download -> bytes-1.3.0.crate https://crates.io/api/v1/crates/cc/1.0.78/download -> cc-1.0.78.crate https://crates.io/api/v1/crates/cesu8/1.1.0/download -> cesu8-1.1.0.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.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/chrono/0.4.23/download -> chrono-0.4.23.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.1/download -> chunked_transfer-1.4.1.crate https://crates.io/api/v1/crates/cipher/0.2.5/download -> cipher-0.2.5.crate https://crates.io/api/v1/crates/clang-sys/1.4.0/download -> clang-sys-1.4.0.crate https://crates.io/api/v1/crates/clap/4.0.32/download -> clap-4.0.32.crate https://crates.io/api/v1/crates/clap_lex/0.3.0/download -> clap_lex-0.3.0.crate https://crates.io/api/v1/crates/clipboard/0.5.0/download -> clipboard-0.5.0.crate https://crates.io/api/v1/crates/clipboard-win/2.2.0/download -> clipboard-win-2.2.0.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/combine/4.6.6/download -> combine-4.6.6.crate https://crates.io/api/v1/crates/cookie/0.16.2/download -> cookie-0.16.2.crate https://crates.io/api/v1/crates/cookie_store/0.16.1/download -> cookie_store-0.16.1.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.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/coreaudio-rs/0.10.0/download -> coreaudio-rs-0.10.0.crate https://crates.io/api/v1/crates/coreaudio-sys/0.2.11/download -> coreaudio-sys-0.2.11.crate https://crates.io/api/v1/crates/cpal/0.13.5/download -> cpal-0.13.5.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.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-utils/0.8.14/download -> crossbeam-utils-0.8.14.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/crypto-mac/0.11.1/download -> crypto-mac-0.11.1.crate https://crates.io/api/v1/crates/ctr/0.6.0/download -> ctr-0.6.0.crate https://crates.io/api/v1/crates/cursive/0.20.0/download -> cursive-0.20.0.crate https://crates.io/api/v1/crates/cursive_buffered_backend/0.6.1/download -> cursive_buffered_backend-0.6.1.crate https://crates.io/api/v1/crates/cursive_core/0.3.6/download -> cursive_core-0.3.6.crate https://crates.io/api/v1/crates/cxx/1.0.85/download -> cxx-1.0.85.crate https://crates.io/api/v1/crates/cxx-build/1.0.85/download -> cxx-build-1.0.85.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.85/download -> cxxbridge-flags-1.0.85.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.85/download -> cxxbridge-macro-1.0.85.crate https://crates.io/api/v1/crates/darling/0.13.4/download -> darling-0.13.4.crate https://crates.io/api/v1/crates/darling/0.14.2/download -> darling-0.14.2.crate https://crates.io/api/v1/crates/darling_core/0.13.4/download -> darling_core-0.13.4.crate https://crates.io/api/v1/crates/darling_core/0.14.2/download -> darling_core-0.14.2.crate https://crates.io/api/v1/crates/darling_macro/0.13.4/download -> darling_macro-0.13.4.crate https://crates.io/api/v1/crates/darling_macro/0.14.2/download -> darling_macro-0.14.2.crate https://crates.io/api/v1/crates/dbus/0.9.6/download -> dbus-0.9.6.crate https://crates.io/api/v1/crates/dbus-tree/0.9.2/download -> dbus-tree-0.9.2.crate https://crates.io/api/v1/crates/derive-new/0.5.9/download -> derive-new-0.5.9.crate https://crates.io/api/v1/crates/digest/0.10.6/download -> digest-0.10.6.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs-next/1.0.2/download -> dirs-next-1.0.2.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.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/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/enum-map/2.4.2/download -> enum-map-2.4.2.crate https://crates.io/api/v1/crates/enum-map-derive/0.11.0/download -> enum-map-derive-0.11.0.crate https://crates.io/api/v1/crates/enum_dispatch/0.3.8/download -> enum_dispatch-0.3.8.crate https://crates.io/api/v1/crates/enumset/1.0.12/download -> enumset-1.0.12.crate https://crates.io/api/v1/crates/enumset_derive/0.6.1/download -> enumset_derive-0.6.1.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/fern/0.6.1/download -> fern-0.6.1.crate https://crates.io/api/v1/crates/fixedbitset/0.4.2/download -> fixedbitset-0.4.2.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.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/0.3.25/download -> futures-0.3.25.crate https://crates.io/api/v1/crates/futures-channel/0.3.25/download -> futures-channel-0.3.25.crate https://crates.io/api/v1/crates/futures-core/0.3.25/download -> futures-core-0.3.25.crate https://crates.io/api/v1/crates/futures-executor/0.3.25/download -> futures-executor-0.3.25.crate https://crates.io/api/v1/crates/futures-io/0.3.25/download -> futures-io-0.3.25.crate https://crates.io/api/v1/crates/futures-macro/0.3.25/download -> futures-macro-0.3.25.crate https://crates.io/api/v1/crates/futures-sink/0.3.25/download -> futures-sink-0.3.25.crate https://crates.io/api/v1/crates/futures-task/0.3.25/download -> futures-task-0.3.25.crate https://crates.io/api/v1/crates/futures-util/0.3.25/download -> futures-util-0.3.25.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/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/gimli/0.27.0/download -> gimli-0.27.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/h2/0.3.15/download -> h2-0.3.15.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/headers/0.3.8/download -> headers-0.3.8.crate https://crates.io/api/v1/crates/headers-core/0.2.0/download -> headers-core-0.2.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.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/hmac/0.11.0/download -> hmac-0.11.0.crate https://crates.io/api/v1/crates/http/0.2.8/download -> http-0.2.8.crate https://crates.io/api/v1/crates/http-body/0.4.5/download -> http-body-0.4.5.crate https://crates.io/api/v1/crates/httparse/1.8.0/download -> httparse-1.8.0.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/hyper/0.14.23/download -> hyper-0.14.23.crate https://crates.io/api/v1/crates/hyper-proxy/0.9.1/download -> hyper-proxy-0.9.1.crate https://crates.io/api/v1/crates/hyper-tls/0.5.0/download -> hyper-tls-0.5.0.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.53/download -> iana-time-zone-0.1.53.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.3/download -> io-lifetimes-1.0.3.crate https://crates.io/api/v1/crates/ioctl-rs/0.2.0/download -> ioctl-rs-0.2.0.crate https://crates.io/api/v1/crates/ipnet/2.7.0/download -> ipnet-2.7.0.crate https://crates.io/api/v1/crates/is-terminal/0.4.2/download -> is-terminal-0.4.2.crate https://crates.io/api/v1/crates/itoa/1.0.5/download -> itoa-1.0.5.crate https://crates.io/api/v1/crates/jni/0.19.0/download -> jni-0.19.0.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/jobserver/0.1.25/download -> jobserver-0.1.25.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_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lewton/0.10.2/download -> lewton-0.10.2.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/libdbus-sys/0.2.2/download -> libdbus-sys-0.2.2.crate https://crates.io/api/v1/crates/libloading/0.7.4/download -> libloading-0.7.4.crate https://crates.io/api/v1/crates/libm/0.2.6/download -> libm-0.2.6.crate https://crates.io/api/v1/crates/libpulse-binding/2.26.0/download -> libpulse-binding-2.26.0.crate https://crates.io/api/v1/crates/libpulse-simple-binding/2.25.0/download -> libpulse-simple-binding-2.25.0.crate https://crates.io/api/v1/crates/libpulse-simple-sys/1.19.2/download -> libpulse-simple-sys-1.19.2.crate https://crates.io/api/v1/crates/libpulse-sys/1.19.3/download -> libpulse-sys-1.19.3.crate https://crates.io/api/v1/crates/librespot-audio/0.4.2/download -> librespot-audio-0.4.2.crate https://crates.io/api/v1/crates/librespot-core/0.4.2/download -> librespot-core-0.4.2.crate https://crates.io/api/v1/crates/librespot-metadata/0.4.2/download -> librespot-metadata-0.4.2.crate https://crates.io/api/v1/crates/librespot-playback/0.4.2/download -> librespot-playback-0.4.2.crate https://crates.io/api/v1/crates/librespot-protocol/0.4.2/download -> librespot-protocol-0.4.2.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.8/download -> link-cplusplus-1.0.8.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/mac-notification-sys/0.5.6/download -> mac-notification-sys-0.5.6.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/maybe-async/0.2.6/download -> maybe-async-0.2.6.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/mio/0.8.5/download -> mio-0.8.5.crate https://crates.io/api/v1/crates/native-tls/0.2.11/download -> native-tls-0.2.11.crate https://crates.io/api/v1/crates/ncurses/5.101.0/download -> ncurses-5.101.0.crate https://crates.io/api/v1/crates/ndk/0.6.0/download -> ndk-0.6.0.crate https://crates.io/api/v1/crates/ndk-context/0.1.1/download -> ndk-context-0.1.1.crate https://crates.io/api/v1/crates/ndk-glue/0.6.2/download -> ndk-glue-0.6.2.crate https://crates.io/api/v1/crates/ndk-macro/0.3.0/download -> ndk-macro-0.3.0.crate https://crates.io/api/v1/crates/ndk-sys/0.3.0/download -> ndk-sys-0.3.0.crate https://crates.io/api/v1/crates/nix/0.23.2/download -> nix-0.23.2.crate https://crates.io/api/v1/crates/nix/0.24.3/download -> nix-0.24.3.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/notify-rust/4.6.0/download -> notify-rust-4.6.0.crate https://crates.io/api/v1/crates/num/0.2.1/download -> num-0.2.1.crate https://crates.io/api/v1/crates/num/0.4.0/download -> num-0.4.0.crate https://crates.io/api/v1/crates/num-bigint/0.2.6/download -> num-bigint-0.2.6.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.2.4/download -> num-complex-0.2.4.crate https://crates.io/api/v1/crates/num-complex/0.4.2/download -> num-complex-0.4.2.crate https://crates.io/api/v1/crates/num-derive/0.3.3/download -> num-derive-0.3.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-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.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.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/num_enum/0.5.7/download -> num_enum-0.5.7.crate https://crates.io/api/v1/crates/num_enum_derive/0.5.7/download -> num_enum_derive-0.5.7.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/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/object/0.30.0/download -> object-0.30.0.crate https://crates.io/api/v1/crates/oboe/0.4.6/download -> oboe-0.4.6.crate https://crates.io/api/v1/crates/oboe-sys/0.4.5/download -> oboe-sys-0.4.5.crate https://crates.io/api/v1/crates/ogg/0.8.0/download -> ogg-0.8.0.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.45/download -> openssl-0.10.45.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-sys/0.9.80/download -> openssl-sys-0.9.80.crate https://crates.io/api/v1/crates/os_pipe/1.1.2/download -> os_pipe-1.1.2.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/owning_ref/0.4.1/download -> owning_ref-0.4.1.crate https://crates.io/api/v1/crates/pancurses/0.17.0/download -> pancurses-0.17.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/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.6/download -> parking_lot_core-0.8.6.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.5/download -> parking_lot_core-0.9.5.crate https://crates.io/api/v1/crates/parse_duration/2.1.1/download -> parse_duration-2.1.1.crate https://crates.io/api/v1/crates/pbkdf2/0.8.0/download -> pbkdf2-0.8.0.crate https://crates.io/api/v1/crates/pdcurses-sys/0.7.1/download -> pdcurses-sys-0.7.1.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.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/petgraph/0.6.2/download -> petgraph-0.6.2.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.26/download -> pkg-config-0.3.26.crate https://crates.io/api/v1/crates/platform-dirs/0.3.0/download -> platform-dirs-0.3.0.crate https://crates.io/api/v1/crates/portaudio-rs/0.3.2/download -> portaudio-rs-0.3.2.crate https://crates.io/api/v1/crates/portaudio-sys/0.1.1/download -> portaudio-sys-0.1.1.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/priority-queue/1.3.0/download -> priority-queue-1.3.0.crate https://crates.io/api/v1/crates/proc-macro-crate/1.2.1/download -> proc-macro-crate-1.2.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.49/download -> proc-macro2-1.0.49.crate https://crates.io/api/v1/crates/protobuf/2.28.0/download -> protobuf-2.28.0.crate https://crates.io/api/v1/crates/protobuf-codegen/2.28.0/download -> protobuf-codegen-2.28.0.crate https://crates.io/api/v1/crates/protobuf-codegen-pure/2.28.0/download -> protobuf-codegen-pure-2.28.0.crate https://crates.io/api/v1/crates/psl-types/2.0.11/download -> psl-types-2.0.11.crate https://crates.io/api/v1/crates/publicsuffix/2.2.3/download -> publicsuffix-2.2.3.crate https://crates.io/api/v1/crates/quick-xml/0.23.1/download -> quick-xml-0.23.1.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.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.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rand_distr/0.4.3/download -> rand_distr-0.4.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_termios/0.1.2/download -> redox_termios-0.1.2.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.7.0/download -> regex-1.7.0.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.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/reqwest/0.11.13/download -> reqwest-0.11.13.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rodio/0.15.0/download -> rodio-0.15.0.crate https://crates.io/api/v1/crates/rspotify/0.11.6/download -> rspotify-0.11.6.crate https://crates.io/api/v1/crates/rspotify-http/0.11.6/download -> rspotify-http-0.11.6.crate https://crates.io/api/v1/crates/rspotify-macros/0.11.6/download -> rspotify-macros-0.11.6.crate https://crates.io/api/v1/crates/rspotify-model/0.11.6/download -> rspotify-model-0.11.6.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.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/rustix/0.36.6/download -> rustix-0.36.6.crate https://crates.io/api/v1/crates/rustls/0.20.7/download -> rustls-0.20.7.crate https://crates.io/api/v1/crates/rustversion/1.0.11/download -> rustversion-1.0.11.crate https://crates.io/api/v1/crates/ryu/1.0.12/download -> ryu-1.0.12.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/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scratch/1.0.3/download -> scratch-1.0.3.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/security-framework/2.7.0/download -> security-framework-2.7.0.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/semver/1.0.16/download -> semver-1.0.16.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_cbor/0.11.2/download -> serde_cbor-0.11.2.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.91/download -> serde_json-1.0.91.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.1/download -> serde_urlencoded-0.7.1.crate https://crates.io/api/v1/crates/sha-1/0.9.8/download -> sha-1-0.9.8.crate https://crates.io/api/v1/crates/sha1/0.10.5/download -> sha1-0.10.5.crate https://crates.io/api/v1/crates/sha2/0.10.6/download -> sha2-0.10.6.crate https://crates.io/api/v1/crates/shannon/0.2.0/download -> shannon-0.2.0.crate https://crates.io/api/v1/crates/shell-words/1.1.0/download -> shell-words-1.1.0.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.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-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/socket2/0.4.7/download -> socket2-0.4.7.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.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/stdweb/0.1.3/download -> stdweb-0.1.3.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strum/0.22.0/download -> strum-0.22.0.crate https://crates.io/api/v1/crates/strum/0.24.1/download -> strum-0.24.1.crate https://crates.io/api/v1/crates/strum_macros/0.22.0/download -> strum_macros-0.22.0.crate https://crates.io/api/v1/crates/strum_macros/0.24.3/download -> strum_macros-0.24.3.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.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/tauri-winrt-notification/0.1.0/download -> tauri-winrt-notification-0.1.0.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/termion/1.5.6/download -> termion-1.5.6.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/thread-id/4.0.0/download -> thread-id-4.0.0.crate https://crates.io/api/v1/crates/time/0.1.45/download -> time-0.1.45.crate https://crates.io/api/v1/crates/time/0.3.17/download -> time-0.3.17.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.6/download -> time-macros-0.2.6.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/tokio/1.23.0/download -> tokio-1.23.0.crate https://crates.io/api/v1/crates/tokio-macros/1.8.2/download -> tokio-macros-1.8.2.crate https://crates.io/api/v1/crates/tokio-native-tls/0.3.0/download -> tokio-native-tls-0.3.0.crate https://crates.io/api/v1/crates/tokio-stream/0.1.11/download -> tokio-stream-0.1.11.crate https://crates.io/api/v1/crates/tokio-util/0.7.4/download -> tokio-util-0.7.4.crate https://crates.io/api/v1/crates/toml/0.5.10/download -> toml-0.5.10.crate https://crates.io/api/v1/crates/tower-service/0.3.2/download -> tower-service-0.3.2.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/tree_magic_mini/3.0.3/download -> tree_magic_mini-3.0.3.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/typenum/1.16.0/download -> typenum-1.16.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.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-segmentation/1.10.0/download -> unicode-segmentation-1.10.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.5.0/download -> ureq-2.5.0.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/uuid/1.2.2/download -> uuid-1.2.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vergen/3.2.0/download -> vergen-3.2.0.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/want/0.3.0/download -> want-0.3.0.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-futures/0.4.33/download -> wasm-bindgen-futures-0.4.33.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/wayland-client/0.29.5/download -> wayland-client-0.29.5.crate https://crates.io/api/v1/crates/wayland-commons/0.29.5/download -> wayland-commons-0.29.5.crate https://crates.io/api/v1/crates/wayland-protocols/0.29.5/download -> wayland-protocols-0.29.5.crate https://crates.io/api/v1/crates/wayland-scanner/0.29.5/download -> wayland-scanner-0.29.5.crate https://crates.io/api/v1/crates/wayland-sys/0.29.5/download -> wayland-sys-0.29.5.crate https://crates.io/api/v1/crates/web-sys/0.3.60/download -> web-sys-0.3.60.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.6/download -> webpki-roots-0.22.6.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/0.39.0/download -> windows-0.39.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-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.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_aarch64_msvc/0.39.0/download -> windows_aarch64_msvc-0.39.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.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_gnu/0.39.0/download -> windows_i686_gnu-0.39.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.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_i686_msvc/0.39.0/download -> windows_i686_msvc-0.39.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.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_gnu/0.39.0/download -> windows_x86_64_gnu-0.39.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.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/windows_x86_64_msvc/0.39.0/download -> windows_x86_64_msvc-0.39.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/winreg/0.5.1/download -> winreg-0.5.1.crate https://crates.io/api/v1/crates/wl-clipboard-rs/0.7.0/download -> wl-clipboard-rs-0.7.0.crate https://crates.io/api/v1/crates/x11-clipboard/0.3.3/download -> x11-clipboard-0.3.3.crate https://crates.io/api/v1/crates/xcb/0.8.2/download -> xcb-0.8.2.crate https://crates.io/api/v1/crates/xi-unicode/0.3.0/download -> xi-unicode-0.3.0.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/zerocopy/0.6.1/download -> zerocopy-0.6.1.crate https://crates.io/api/v1/crates/zerocopy-derive/0.3.2/download -> zerocopy-derive-0.3.2.crate
 _eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=8a2d6752d1b7f6d7d2d3319903c9e1de
+_md5_=73415f5e25316619074027c9973de9b8
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 3a4dc6b7e205..4909002c6d8e 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.13.6-r1 b/metadata/md5-cache/net-analyzer/icinga2-2.13.6-r1
new file mode 100644
index 000000000000..6c631ee5b96a
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.13.6-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bison >=sys-devel/flex-2.5.35 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/openssl:0= dev-libs/boost:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd
+DESCRIPTION=Distributed, general purpose, network monitoring engine
+EAPI=7
+HOMEPAGE=https://icinga.com/
+INHERIT=cmake systemd
+IUSE=console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl:0= dev-libs/boost:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) acct-group/nagios
+REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
+SLOT=0
+SRC_URI=https://github.com/Icinga/icinga2/archive/v2.13.6.tar.gz -> icinga2-2.13.6.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=529467850ee9c1f9f8454a41ad546758
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index f8f4e5932810..960d226b6467 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/libidn2-2.3.4 b/metadata/md5-cache/net-dns/libidn2-2.3.4
index 425f87e8ae98..d20c6c589373 100644
--- a/metadata/md5-cache/net-dns/libidn2-2.3.4
+++ b/metadata/md5-cache/net-dns/libidn2-2.3.4
@@ -4,12 +4,12 @@ DEPEND=dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 DESCRIPTION=An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2/
-INHERIT=multilib-minimal toolchain-funcs verify-sig
+INHERIT=flag-o-matic multilib-minimal toolchain-funcs verify-sig
 IUSE=nls 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 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=GPL-2+ LGPL-3+
 RDEPEND=dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/2
 SRC_URI=mirror://gnu/libidn/libidn2-2.3.4.tar.gz verify-sig? ( mirror://gnu/libidn/libidn2-2.3.4.tar.gz.sig )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=84bba3ddf8e921a2befd944ae9d61632
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=a02151f2edc4cfeff62640d449b99443
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 13ca686aff85..468d3fac578c 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libtirpc-1.3.3 b/metadata/md5-cache/net-libs/libtirpc-1.3.3
index 0b371e8f7c8f..99269b36c70b 100644
--- a/metadata/md5-cache/net-libs/libtirpc-1.3.3
+++ b/metadata/md5-cache/net-libs/libtirpc-1.3.3
@@ -4,12 +4,12 @@ DEPEND=kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 DESCRIPTION=Transport Independent RPC library (SunRPC replacement)
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/libtirpc/ https://git.linux-nfs.org/?p=steved/libtirpc.git
-INHERIT=multilib-minimal usr-ldscript
+INHERIT=flag-o-matic multilib-minimal toolchain-funcs usr-ldscript
 IUSE=kerberos 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 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD BSD-2 BSD-4 LGPL-2.1+
 RDEPEND=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(-)?] )
 SLOT=0/3
 SRC_URI=mirror://sourceforge/libtirpc/libtirpc-1.3.3.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	usr-ldscript	80677644cd5fa559d15743fb93dcbf5a
-_md5_=2f757a861c741fc36a0aa263cfe273f0
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	usr-ldscript	80677644cd5fa559d15743fb93dcbf5a
+_md5_=bf6cf4a4ee830897fe7398c0710d4872
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index b8b330c10e4a..e9b25f60a534 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/qmail-autoresponder-2.0 b/metadata/md5-cache/net-mail/qmail-autoresponder-2.0-r1
index 062d52ddbc74..d3d0465a0b99 100644
--- a/metadata/md5-cache/net-mail/qmail-autoresponder-2.0
+++ b/metadata/md5-cache/net-mail/qmail-autoresponder-2.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install
 DEPEND=>=dev-libs/bglibs-2.04 mysql? ( dev-db/mysql-connector-c:0= )
 DESCRIPTION=Rate-limited autoresponder for qmail
-EAPI=7
+EAPI=8
 HOMEPAGE=https://untroubled.org/qmail-autoresponder/
 INHERIT=toolchain-funcs
 IUSE=mysql
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/bglibs-2.04 mysql? ( dev-db/mysql-connector-c:0= ) virtual/qm
 SLOT=0
 SRC_URI=https://untroubled.org/qmail-autoresponder/archive/qmail-autoresponder-2.0.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=33993cebe154189eaf3b3111baff1a6e
+_md5_=3a8da643053b053c1680f730f07882b5
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index 85be0c5b8fb3..1324b6586f62 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/tin-2.6.2 b/metadata/md5-cache/net-nntp/tin-2.6.2
new file mode 100644
index 000000000000..b9e4ad7c2872
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/tin-2.6.2
@@ -0,0 +1,15 @@
+BDEPEND=app-alternatives/yacc virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install postinst
+DEPEND=dev-libs/icu:= dev-libs/uulib sys-libs/ncurses:= virtual/libiconv cancel-locks? ( >=net-libs/canlock-3.0:= ) gpg? ( app-crypt/gnupg ) nls? ( virtual/libintl ) pcre2? ( dev-libs/libpcre2:= ) !pcre2? ( dev-libs/libpcre:3 ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( libtls? ( dev-libs/libretls:= ) !libtls? ( dev-libs/openssl:= ) ) )
+DESCRIPTION=A threaded NNTP and spool based UseNet newsreader
+EAPI=8
+HOMEPAGE=http://www.tin.org/
+INHERIT=optfeature toolchain-funcs
+IUSE=cancel-locks debug gnutls gpg libtls nls +pcre2 sasl socks5 ssl
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=dev-libs/icu:= dev-libs/uulib sys-libs/ncurses:= virtual/libiconv cancel-locks? ( >=net-libs/canlock-3.0:= ) gpg? ( app-crypt/gnupg ) nls? ( virtual/libintl ) pcre2? ( dev-libs/libpcre2:= ) !pcre2? ( dev-libs/libpcre:3 ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( libtls? ( dev-libs/libretls:= ) !libtls? ( dev-libs/openssl:= ) ) )
+SLOT=0
+SRC_URI=ftp://ftp.tin.org/pub/news/clients/tin/stable/tin-2.6.2.tar.xz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=c1d2eb8177d8602692eb4e3044cb64ce
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 008e7f2a2349..959bcdd651b8 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/ncdc-1.22.1-r1 b/metadata/md5-cache/net-p2p/ncdc-1.22.1-r1
deleted file mode 100644
index 209677a3f3e3..000000000000
--- a/metadata/md5-cache/net-p2p/ncdc-1.22.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/makeheaders virtual/pkgconfig dev-lang/perl
-DEFINED_PHASES=compile configure prepare
-DEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
-DESCRIPTION=ncurses directconnect client
-EAPI=7
-HOMEPAGE=https://dev.yorhel.nl/ncdc
-INHERIT=toolchain-funcs
-IUSE=geoip
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
-SLOT=0
-SRC_URI=https://dev.yorhel.nl/download/ncdc-1.22.1.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=7e02cb54d5929ffd2b7a0a06a32fac5d
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index a66931484be7..454f138e7287 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/bluez-5.65 b/metadata/md5-cache/net-wireless/bluez-5.65-r1
index 6cbb2e37eb5b..71536bddc27f 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.65
+++ b/metadata/md5-cache/net-wireless/bluez-5.65-r1
@@ -8,10 +8,10 @@ INHERIT=autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev mult
 IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) >=sys-apps/dbus-1.6:= udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/dbus-python-1[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) )
+RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) >=sys-apps/dbus-1.6:= udev? ( >=virtual/udev-172 ) deprecated? ( !net-wireless/bluez-hcidump ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/dbus-python-1[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) )
 REQUIRED_USE=btpclient? ( mesh ) extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ) test-programs? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.65.tar.xz https://dev.gentoo.org/~pacho/bluez/power-state-adapter-property.patch
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=8c086c0486667925d2c22cbfff3e23b1
+_md5_=b25f8bdf19a29a49b3b80a3e8a2f72f6
diff --git a/metadata/md5-cache/net-wireless/bluez-5.66 b/metadata/md5-cache/net-wireless/bluez-5.66-r1
index 917d5cad9bbd..5c5c4b758caf 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.66
+++ b/metadata/md5-cache/net-wireless/bluez-5.66-r1
@@ -8,10 +8,10 @@ INHERIT=autotools linux-info python-single-r1 systemd udev multilib-minimal
 IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) >=sys-apps/dbus-1.6:= udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/dbus-python-1[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/dbus-python-1[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) )
+RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) >=sys-apps/dbus-1.6:= udev? ( >=virtual/udev-172 ) deprecated? ( !net-wireless/bluez-hcidump ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/dbus-python-1[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/dbus-python-1[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) )
 REQUIRED_USE=btpclient? ( mesh ) extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) test-programs? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.66.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=a08ff7920e376a5d168139bb0b655dcc
+_md5_=59c98223880b9006ae26c50f1243ceb3
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 21b773e52d41..1b29e5556a38 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/passwdqc-1.4.0-r2 b/metadata/md5-cache/sys-auth/passwdqc-1.4.0-r2
index 55ffc6a7e3d2..f023ae1dacba 100644
--- a/metadata/md5-cache/sys-auth/passwdqc-1.4.0-r2
+++ b/metadata/md5-cache/sys-auth/passwdqc-1.4.0-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install prepare setup
+DEFINED_PHASES=compile configure install prepare setup
 DEPEND=sys-libs/pam virtual/libcrypt:=
 DESCRIPTION=Password strength checking library (and PAM module)
 EAPI=7
 HOMEPAGE=http://www.openwall.com/passwdqc/
-INHERIT=pam toolchain-funcs
+INHERIT=flag-o-matic pam toolchain-funcs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Openwall BSD public-domain
 RDEPEND=sys-libs/pam virtual/libcrypt:=
 SLOT=0
 SRC_URI=http://www.openwall.com/passwdqc/passwdqc-1.4.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1130788b445819861222b165ec86e86e
+_md5_=3207e76a6fc4710c45bbe982ba16d12a
diff --git a/metadata/md5-cache/sys-auth/passwdqc-2.0.2-r1 b/metadata/md5-cache/sys-auth/passwdqc-2.0.2-r1
index 32a494147abb..4fc31212191c 100644
--- a/metadata/md5-cache/sys-auth/passwdqc-2.0.2-r1
+++ b/metadata/md5-cache/sys-auth/passwdqc-2.0.2-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install prepare setup
+DEFINED_PHASES=compile configure install prepare setup
 DEPEND=sys-libs/pam virtual/libcrypt:=
 DESCRIPTION=Password strength checking library (and PAM module)
 EAPI=7
 HOMEPAGE=http://www.openwall.com/passwdqc/
-INHERIT=pam toolchain-funcs
+INHERIT=flag-o-matic pam toolchain-funcs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Openwall BSD public-domain
 RDEPEND=sys-libs/pam virtual/libcrypt:=
 SLOT=0
 SRC_URI=http://www.openwall.com/passwdqc/passwdqc-2.0.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8511a5cd34e378b0810c2bb87dd72c21
+_md5_=85fee925818bee3cd3398c64c99381bf
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 4a12a4fec2eb..571f32437457 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/binutils-2.32-r2 b/metadata/md5-cache/sys-devel/binutils-2.32-r2
index a417da657f05..62b0a75be4ef 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.32-r2
+++ b/metadata/md5-cache/sys-devel/binutils-2.32-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.32
 SRC_URI=mirror://gnu/binutils/binutils-2.32.tar.xz https://dev.gentoo.org/~slyfox/distfiles/binutils-2.32-patches-3.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=51b1dacdcc8a54341f342cd589bef4e1
+_md5_=fc6d3e3ad12a48bae01162e69858f917
diff --git a/metadata/md5-cache/sys-devel/binutils-2.33.1-r1 b/metadata/md5-cache/sys-devel/binutils-2.33.1-r1
index c79047ed692b..1b974e491640 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.33.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.33.1-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.33
 SRC_URI=mirror://gnu/binutils/binutils-2.33.1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/binutils-2.33.1-patches-2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=02587344bf7efa7450a90a5a256b71b7
+_md5_=e0c373defd14c43abf3012bf2e6a6ab5
diff --git a/metadata/md5-cache/sys-devel/binutils-2.34-r2 b/metadata/md5-cache/sys-devel/binutils-2.34-r2
index 3d3ea57ecf52..96a58dd2bce5 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.34-r2
+++ b/metadata/md5-cache/sys-devel/binutils-2.34-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.34
 SRC_URI=mirror://gnu/binutils/binutils-2.34.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.34-patches-6.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3c15e92bc36ba178e228fcfe8121c78e
+_md5_=1c66e3f62c0997e1091167ed518a7e91
diff --git a/metadata/md5-cache/sys-devel/binutils-2.35.2 b/metadata/md5-cache/sys-devel/binutils-2.35.2
index 5a58cde9c033..24aef8c0806e 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.35.2
+++ b/metadata/md5-cache/sys-devel/binutils-2.35.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.35
 SRC_URI=mirror://gnu/binutils/binutils-2.35.2.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.35.2-patches-1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0e28e87195c8c051b75aa7c3d804a0f9
+_md5_=3d912f109727742c0f48735ee7e11208
diff --git a/metadata/md5-cache/sys-devel/binutils-2.36.1-r2 b/metadata/md5-cache/sys-devel/binutils-2.36.1-r2
index c6c5de4f5584..8cbc06c301e2 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.36.1-r2
+++ b/metadata/md5-cache/sys-devel/binutils-2.36.1-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.36
 SRC_URI=mirror://gnu/binutils/binutils-2.36.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.36.1-patches-5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=73da01f6051434442c1613b3ab430ad6
+_md5_=bbd9ca63dd668c26e52354a906a2fcbd
diff --git a/metadata/md5-cache/sys-devel/binutils-2.37_p1-r2 b/metadata/md5-cache/sys-devel/binutils-2.37_p1-r2
index c23e7c7b654b..196a01be4f0e 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.37_p1-r2
+++ b/metadata/md5-cache/sys-devel/binutils-2.37_p1-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.37
 SRC_URI=mirror://gnu/binutils/binutils-2.37_p1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.37_p1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.37_p1-patches-2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=72958f4ac3b4fe8f4ac186f38c0f6699
+_md5_=5cfd9f759c643db381d03505201c447a
diff --git a/metadata/md5-cache/sys-devel/binutils-2.38-r2 b/metadata/md5-cache/sys-devel/binutils-2.38-r2
index feb91e8df878..77e9feea2e6c 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.38-r2
+++ b/metadata/md5-cache/sys-devel/binutils-2.38-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.38
 SRC_URI=mirror://gnu/binutils/binutils-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.38-patches-4.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=652c6604bff3d42d62d698f81df1c051
+_md5_=bc6d5fc1bab942fb61e83758c2beec3c
diff --git a/metadata/md5-cache/sys-devel/binutils-2.39-r4 b/metadata/md5-cache/sys-devel/binutils-2.39-r4
index 95ebd77c51e2..a6b12be2f78c 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.39-r4
+++ b/metadata/md5-cache/sys-devel/binutils-2.39-r4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.39
 SRC_URI=mirror://gnu/binutils/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.39-patches-5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=13556c5d78eb72ab768e0bca516910f9
+_md5_=be0b46c8672ab8649f7aebe8da451aee
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index 706782a80cf7..6d0b4009660d 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -12,4 +12,4 @@ RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=9999
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a4637ce041594e020649fa3f94d3bf61
+_md5_=5702bbd90cad9d61db0fe5384dffa204
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.7 b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
index 1cfee6e5387a..99965965f9ce 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.7
+++ b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
@@ -12,7 +12,7 @@ PDEPEND=sys-devel/clang-toolchain-symlinks:15 ~sys-devel/clang-runtime-15.0.7
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ~sys-devel/llvm-15.0.7:15=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-15.0.7 llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.7[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.7[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.7[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.7[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.7[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.7[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.7[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.7[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.7[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.7[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.7[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.7[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.7[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.7[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.7[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.7[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.7[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.7[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.7[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.7[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.7[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.7[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.7[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.7[llvm_targets_SPIRV] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV )
 RESTRICT=!test? ( test ) !test? ( test )
-SLOT=15/15
+SLOT=15/15g1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	30c0bc4eab8e7c1d4b586ae5446ae3d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2cac4d9ae4d923c1e62221c0e86e45f9
+_md5_=3fed48f6acd71411b4a22686757d7b82
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230112 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230112
new file mode 100644
index 000000000000..ada6270904b2
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230112
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=10
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20230112/gcc-10-20230112.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-3.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	41d05cbdd6da4da882a3c12e8af5e660	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=95c900478c5b799f28e16759681c4faf
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230113 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230113
new file mode 100644
index 000000000000..4391664664a0
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230113
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20230113/gcc-11-20230113.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-6.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	41d05cbdd6da4da882a3c12e8af5e660	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=a80af34ef7e17e0a781482caf71bd013
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20230114 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20230114
new file mode 100644
index 000000000000..809cdf347dba
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20230114
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=12
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20230114/gcc-12-20230114.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-9.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	41d05cbdd6da4da882a3c12e8af5e660	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=6bce4c4474a47698d06cae5f7573bac8
diff --git a/metadata/md5-cache/sys-devel/make-4.4.0.90 b/metadata/md5-cache/sys-devel/make-4.4.0.90
new file mode 100644
index 000000000000..07f64e8e45dd
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/make-4.4.0.90
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=guile? ( >=dev-scheme/guile-1.8:= )
+DESCRIPTION=Standard tool to compile source trees
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/make/make.html
+INHERIT=flag-o-matic verify-sig
+IUSE=guile nls static verify-sig
+LICENSE=GPL-3+
+RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=https://alpha.gnu.org/gnu/make/make-4.4.0.90.tar.gz verify-sig? ( https://alpha.gnu.org/gnu/make/make-4.4.0.90.tar.gz.sig )
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=011b47933408fc5d39f4a358112e7856
diff --git a/metadata/md5-cache/sys-devel/make-9999 b/metadata/md5-cache/sys-devel/make-9999
index e1c479fad712..5f699dc1bf48 100644
--- a/metadata/md5-cache/sys-devel/make-9999
+++ b/metadata/md5-cache/sys-devel/make-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=81a8d5e78a3411add148146957c8e2d7
+_md5_=011b47933408fc5d39f4a358112e7856
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 4763a48a2b6e..4edc5f92f1c6 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-kernel-5.10.163 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.163
new file mode 100644
index 000000000000..8f50be7dfffc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.163
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.163
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.163 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.163
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-172.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-172.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g5.tar.gz -> gentoo-kernel-config-g5.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=001f89b6977f709fdf028e3602a12876
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.88 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.88
new file mode 100644
index 000000000000..6fc4913451fd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.88
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.88
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.88 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.88
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-92.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-92.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g5.tar.gz -> gentoo-kernel-config-g5.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=c9bd5ab3244e3fff322b003ae6c739b8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.6 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.6
new file mode 100644
index 000000000000..17f92ec0d282
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.6
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.6
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.1.6 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.6
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-8.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g5.tar.gz -> gentoo-kernel-config-g5.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.2-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.2-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.2-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.2-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=864b2c9e90fa4f1c2327488dc32e9794
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.163 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.163
new file mode 100644
index 000000000000..520cfdcf1652
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.163
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.163
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.163 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.163
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-172.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-172.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.163-1.gpkg.tar -> gentoo-kernel-5.10.163-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.163-1.gpkg.tar -> gentoo-kernel-5.10.163-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.163-1.gpkg.tar -> gentoo-kernel-5.10.163-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.163-1.gpkg.tar -> gentoo-kernel-5.10.163-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
+_md5_=f8fa00c4b0476dc3be4b1ae7e6b46403
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.88 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.88
new file mode 100644
index 000000000000..a4b930c01f3d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.88
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.88
+RDEPEND=!sys-kernel/gentoo-kernel:5.15.88 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.88
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-92.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-92.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.88-1.gpkg.tar -> gentoo-kernel-5.15.88-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.88-1.gpkg.tar -> gentoo-kernel-5.15.88-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.88-1.gpkg.tar -> gentoo-kernel-5.15.88-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.88-1.gpkg.tar -> gentoo-kernel-5.15.88-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
+_md5_=94eb09196b8203bd20e442e87c3756c9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.6 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.6
new file mode 100644
index 000000000000..9dcb363a4c39
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.6
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.6
+RDEPEND=!sys-kernel/gentoo-kernel:6.1.6 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.6
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-8.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.6-1.gpkg.tar -> gentoo-kernel-6.1.6-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.6-1.gpkg.tar -> gentoo-kernel-6.1.6-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.6-1.gpkg.tar -> gentoo-kernel-6.1.6-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.6-1.gpkg.tar -> gentoo-kernel-6.1.6-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
+_md5_=bf277291b9a653d45c9e133d3282088a
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.163 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.163
new file mode 100644
index 000000000000..d89b5f18d164
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.163
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.163
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.163
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.163.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g5.tar.gz -> gentoo-kernel-config-g5.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.163.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=e7be0044b5c5e7e2b18849649963eed0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.88 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.88
new file mode 100644
index 000000000000..a073fcee7130
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.88
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.88
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.88
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.88.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g5.tar.gz -> gentoo-kernel-config-g5.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.88.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=ea4541b90ff8fcd392a0257259bb70e8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.6 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.6
new file mode 100644
index 000000000000..60b701598525
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.6
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.6
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.6
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.6.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g5.tar.gz -> gentoo-kernel-config-g5.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.6.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.2-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.2-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.2-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.2-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=50e94af3883933d954018f03a602b9d9
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index e2ce453f4bcf..743f534df666 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.28-r2 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.28-r2
index 7cc469a436b7..cc650ad6858b 100644
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.28-r2
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.28-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.28-autotools.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9e010eade3d237f87a350783029ba142
+_md5_=3032d9a425e1ab193faf9bdcfa95d076
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.33 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.33
index 11901fc5254e..410ed566858d 100644
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.33
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.33
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.33-autotools.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=abd37daeff0229954ed66d0ab8a2fc51
+_md5_=e1a29bee80295a6b6d4563c2005f0938
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.13-r1 b/metadata/md5-cache/sys-libs/zlib-1.2.13-r1
index ab89dd423dd7..9e9329cf992e 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.13-r1
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.13-r1
@@ -4,7 +4,7 @@ DEPEND=!sys-libs/zlib-ng[compat]
 DESCRIPTION=Standard (de)compression library
 EAPI=8
 HOMEPAGE=https://zlib.net/
-INHERIT=autotools multilib-minimal flag-o-matic usr-ldscript verify-sig
+INHERIT=autotools multilib-minimal flag-o-matic toolchain-funcs usr-ldscript verify-sig
 IUSE=minizip 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 split-usr verify-sig
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=ZLIB
@@ -12,4 +12,4 @@ RDEPEND=!sys-libs/zlib-ng[compat]
 SLOT=0/1
 SRC_URI=https://zlib.net/zlib-1.2.13.tar.xz https://zlib.net/fossils/zlib-1.2.13.tar.xz https://zlib.net/current/beta/zlib-1.2.13.tar.xz verify-sig? ( https://zlib.net/zlib-1.2.13.tar.xz.asc ) elibc_Cygwin? ( https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> zlib-1.2.11-cygwin-gzopen_w.patch https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> zlib-1.2.7-cygwin-minizip.patch )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	usr-ldscript	80677644cd5fa559d15743fb93dcbf5a	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=41f30a1cd05eb4d157cae0c7e8cbe3a0
+_md5_=22ef853592df16c85582c0cf1ffb9aa1
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index ee6a9c807921..740dd874107b 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.163 b/metadata/md5-cache/virtual/dist-kernel-5.10.163
new file mode 100644
index 000000000000..6a25c7c5e8ae
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.163
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.163 ~sys-kernel/gentoo-kernel-bin-5.10.163 ~sys-kernel/vanilla-kernel-5.10.163 )
+SLOT=0/5.10.163
+_md5_=2b14c705dcd61ca0cb392a256fbcb273
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.88 b/metadata/md5-cache/virtual/dist-kernel-5.15.88
new file mode 100644
index 000000000000..895c2452f7d2
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.15.88
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.88 ~sys-kernel/gentoo-kernel-bin-5.15.88 ~sys-kernel/vanilla-kernel-5.15.88 )
+SLOT=0/5.15.88
+_md5_=2b14c705dcd61ca0cb392a256fbcb273
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.1.6 b/metadata/md5-cache/virtual/dist-kernel-6.1.6
new file mode 100644
index 000000000000..0db7c8fd2194
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.1.6
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.1.6 ~sys-kernel/gentoo-kernel-bin-6.1.6 ~sys-kernel/vanilla-kernel-6.1.6 )
+SLOT=0/6.1.6
+_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 805b612438de..22680d2d4234 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/tela-icon-theme-99999999 b/metadata/md5-cache/x11-themes/tela-icon-theme-99999999
index 92ceabc1916d..e2077dca7542 100644
--- a/metadata/md5-cache/x11-themes/tela-icon-theme-99999999
+++ b/metadata/md5-cache/x11-themes/tela-icon-theme-99999999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( standard black blue brown green grey orange pink purple red ye
 RESTRICT=binchecks strip test
 SLOT=0
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	2347f8fe2d392b2a091191f94be37e6f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=09959e79711c9f1b5a258b14ae6d09f2
+_md5_=8223a36d0022da36578419f77d0d1db3
diff --git a/metadata/news/2023-01-01-hardening-fortify-assertions/2023-01-01-hardening-fortify-assertions.en.txt b/metadata/news/2023-01-01-hardening-fortify-assertions/2023-01-01-hardening-fortify-assertions.en.txt
index f0aab216a04f..847e96812eb2 100644
--- a/metadata/news/2023-01-01-hardening-fortify-assertions/2023-01-01-hardening-fortify-assertions.en.txt
+++ b/metadata/news/2023-01-01-hardening-fortify-assertions/2023-01-01-hardening-fortify-assertions.en.txt
@@ -5,21 +5,29 @@ Revision: 2
 News-Item-Format: 2.0
 Display-If-Installed: sys-devel/gcc[hardened]
 Display-If-Profile: features/hardened
-Display-If-Profile: default/linux/ppc64le/17.0/musl/hardened
-Display-If-Profile: default/linux/ppc/17.0/musl/hardened
-Display-If-Profile: default/linux/amd64/17.0/no-multilib/hardened
-Display-If-Profile: default/linux/amd64/17.0/hardened
 Display-If-Profile: default/linux/amd64/17.0/musl/hardened
+Display-If-Profile: default/linux/amd64/17.0/musl/hardened/selinux
 Display-If-Profile: default/linux/amd64/17.1/hardened
+Display-If-Profile: default/linux/amd64/17.1/hardened/selinux
 Display-If-Profile: default/linux/amd64/17.1/no-multilib/hardened
-Display-If-Profile: default/linux/x86/17.0/hardened
-Display-If-Profile: default/linux/arm/17.0/musl/armv7a/hardened
-Display-If-Profile: default/linux/arm/17.0/musl/armv6j/hardened
-Display-If-Profile: default/linux/arm/17.0/armv7a/hardened
+Display-If-Profile: default/linux/amd64/17.1/no-multilib/hardened/selinux
 Display-If-Profile: default/linux/arm/17.0/armv6j/hardened
-Display-If-Profile: default/linux/ppc64/17.0/musl/hardened
+Display-If-Profile: default/linux/arm/17.0/armv7a/hardened
+Display-If-Profile: default/linux/arm/17.0/armv7a/hardened/selinux
+Display-If-Profile: default/linux/arm/17.0/armv7a/hardened/selinux
+Display-If-Profile: default/linux/arm/17.0/musl/armv6j/hardened
+Display-If-Profile: default/linux/arm/17.0/musl/armv6j/hardened/selinux
+Display-If-Profile: default/linux/arm/17.0/musl/armv7a/hardened
+Display-If-Profile: default/linux/arm/17.0/musl/armv7a/hardened/selinux
 Display-If-Profile: default/linux/arm64/17.0/hardened
+Display-If-Profile: default/linux/arm64/17.0/hardened/selinux
 Display-If-Profile: default/linux/arm64/17.0/musl/hardened
+Display-If-Profile: default/linux/arm64/17.0/musl/hardened/selinux
+Display-If-Profile: default/linux/ppc/17.0/musl/hardened
+Display-If-Profile: default/linux/ppc64/17.0/musl/hardened
+Display-If-Profile: default/linux/ppc64le/17.0/musl/hardened
+Display-If-Profile: default/linux/x86/17.0/hardened
+Display-If-Profile: default/linux/x86/17.0/hardened/selinux
 
 Gentoo's hardened profiles are adopting two new modern toolchain hardening
 techniques:
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 9a8edfffb675..327edddc301f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 14965 BLAKE2B 0511d9d714cebde2326e23abfa24bba7318694b5216c96f343d6d94416db2ba397ccc9f0f63ea9c7707aa0414d66e329fb1669bedb5e961cf73b188b04dac363 SHA512 bc41483b3882eeb50bbf35dc4b007fdb5080fc09c4d64d83706e8c2e509eccc05aa28c839c8c30c89e9b3fbc6832e099264b3f3b6e0b76887f0b37a1f8a14e1d
-TIMESTAMP 2023-01-14T17:09:56Z
+MANIFEST Manifest.files.gz 14966 BLAKE2B 687a7b166f711e4c3c75d588b8febb4831fac9bee694b4222597007a9b433fee3a5aa6e187f1fc35937c84f642d144e511d63be549688dfd15f1839a5369d701 SHA512 bd9169c0f73f3e95819cf527d7df79adcfc029e6bfc752f29b75c7be14518984914e4ae2cb94e42a6398dc1af3b2a3e52070736093238502bb4eced7f5775b16
+TIMESTAMP 2023-01-14T23:09:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPC4eRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPDNkVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAVsw//Ua0MlDuN95aOsx/Ty6JCucxeToEkadhtVWY4CE7a+eLWmRaIFr0cz7tS
-uP528jGYDkoNI8cGIII7xhNEmEZLfKDcAWgDMRrlx6FRETxyc/TN1zIO0Fnv5sEg
-ibnoL4K3bvXFX1Lm569tVZbF2Aj6e+Oh7sPJSabBg6sifBpI+tXrD53S5dOMySDl
-DA8ylc1U7HC9P9QWJjXdRIWtS6FYdhb9BSNdNMfj501l9Nt1X9eoj4Fa6Cd78gBF
-ruBs7Z3jdWrR/S56rfFVmjALoSp+1/nczrY62feF+76jkWBAG2WD2we3oj3HkQRH
-RKNNF9rvictt18UTEKXlgNLeua5njMNcBjfn8d9vd5t/piVJSj4XD840qGJD+PTB
-ni/mTSUec3J4MebZWP/my8GkNVuc2JgK+A2o+90sv9Fej8CIkjVCS4A8a5kdMTeo
-KvGlzJ5KRzuIA0bree+xdIoqF4y6d7J4QB2EjAdx+W1QgHeY7i+6EkEFF9LJdEbn
-BHVYOXugdfvu5/bi5kV4Zg3InFEPu78D5GXQkCTY8PmxkA62vkafRKK6c1Wv48Vj
-Fpo/ntdj3A83jTUCVaCy5Zi2sEeTFW6xcARPJkhTxDLBq7OaGdTWM0TrnHeWNBDU
-2uWyqCxEtKkhrOM+kMbg4QNLEEUUmyCdzEMgTA6Sdtx+rgIGERg=
-=IGPk
+klBzzhAAjGL4+C4rMkEC2bIrxdNw+O6O7gxPIseRglTo/+eTRLkCLS+JBgZ2Q0cJ
+/khBV69p3hJtYZPn9AjeY2cdsATi87CLjUelz6Ddq1Bbdqx/Hb2IJ6fjm7Td20sH
+p9CYq9zTxxL/7NiPJ7ieLxGkWk/16A3uDQXSBwGIAq8SV/aRnX1/8arNSK0rrqsI
+iAc1lEepbErcV5t6Mftt8oqPLz0TMXowGdFSDPe3ygeyc3Eyd2iqgJJsQur5b/Bu
+Xc7LdUxc5mIJSVcfTZNm1O6TlezNhRZN8Ak9DB9ARh3dLHVsoAd8YAiCvklIJz5a
+5BbHT9I475Zfsr/UVY7DaCxY5lLB2zKJ7A1zJUlD131M4GzgBFJtj6mMytRJoPtU
+AvzP+ZW/oB/389sB+S3fYQnU+9GpiL0tcFdlbs1p5fRuo8phq+Hea0cRNK7Zm3tB
+KjfehxBfGzmUCMmK4frcMV29qRdI2/BMoziNgZVzsxfmU4I9/xs3UtjH1a6c+g5C
+41TsJGfw4NM+jbba2RDs8GmC4yMF5ctqZwg+Hdh8To4p5qYanRHWWtac2Hfl4hSE
+Ke1HHOUEEvP5uFo6QdB1YWhtpVZBhLJkh5htNJaU09Ej2JyInK/RWKFFMi/ltscg
+EcNH4VEJpQOrUKofZq0EZ3sfOI2PGec+lm/gTi2Oxhfv+I9TEtw=
+=R9/C
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 56b30d6fbe8f..2bf61cc11db9 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 6876ff48e760..04ca32f8565d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 14 Jan 2023 17:09:52 +0000
+Sat, 14 Jan 2023 23:09:53 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index e2e96924977f..f2e67aefc7fe 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-6b8c798b7b8b2b2ea9cb833842c733c494ad0df2 1672611025 2023-01-01T22:10:25+00:00
+a49aa1b25808f0e08157406a45560e3b7efba275 1673737523 2023-01-14T23:05:23+00:00
diff --git a/metadata/timestamp b/metadata/timestamp
index 58595030bb5b..86199d21ecf7 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jan 14 05:09:52 PM UTC 2023
+Sat Jan 14 11:09:53 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f8a325cc16fb..8046c338164b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 14 Jan 2023 17:15:01 +0000
+Sat, 14 Jan 2023 23:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index c3c141318cbe..07c8002c6c24 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-e29411b400654d1359849cea5f41c9582174b3ee 1673714710 2023-01-14T16:45:10+00:00
+f236089602cf789664d57b9a0777507566e3db24 1673736468 2023-01-14T22:47:48+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 822e32885e76..7ef220a4285e 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1673716201 Sat 14 Jan 2023 05:10:01 PM UTC
+1673737801 Sat 14 Jan 2023 11:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 6876ff48e760..04ca32f8565d 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 14 Jan 2023 17:09:52 +0000
+Sat, 14 Jan 2023 23:09:53 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index e80ed823a169..a92d716ea358 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 59e40a86098f..32b414ef7208 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,6 +1,8 @@
+AUX icinga2-2.13.6-boost-1.81.patch 3325 BLAKE2B 8eda4f4ff774baafcdbb12d6e0ee978f3d12bfd659a5662ef0613512b299530fe4ea8afc50114f24e8698797443430da5d6b2774da08004b7f0d4889463bcaaa SHA512 00f0332a7cbdf205f6f01d5fcebb182ce0b0d68d5038a6646c6b76fbfe5416daa59f7bad9e8bf312f5ccb5c39ae4fce6888dc35718acca8b84cddee0d6d28f11
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.13.6.tar.gz 9666870 BLAKE2B 50fd463ddb5d5d01ae96cb8457f2c4044c126c308f3d142bb6eb5ac95cf1f5704cd911236acd71ed7b77a596c07e65a96bbebce028bd666126324447d4f91aad SHA512 5fcf480c305487c7988d6cacfcb64c768c0f0e749704247c3d0ded746284ff5485e0a3d25c82fba1305414d47067a9eb80f84de594267ddf050a0b913825cd71
+EBUILD icinga2-2.13.6-r1.ebuild 4033 BLAKE2B a4e8f10d6dbe72a2d7432e56a6dc0caffdbc9ab5831b52df963bc9369b630010938e1f2f669c73714c40dd63f0e44300c58f5d7044b486c70447eab651c524cb SHA512 62c3e63c711ea16d0081f1b0be4610b6f1d19d613d18cf733ffb751894e75f272d8c22354f30792c391d38626cd72a52ef81c2adbed785717dff5eeda1ab85ef
 EBUILD icinga2-2.13.6.ebuild 3983 BLAKE2B 0d4ac0f6455d2ff0193463bfa8472c5dbd8a7115b46efd7721e79b382a29cf0919cc87b85696b39299458fea6cd1739b23b855babc2ea63ec8a00b5a6d46cd03 SHA512 809bf739c2779af8102d3ef01fb34526997284f5446622a90a58de4116d60868688771c4f73eb2ef6ac8e8bce60569298d3c05ef45549760a63f699f8448032c
 EBUILD icinga2-9999.ebuild 3985 BLAKE2B 5f573b61590cdd31f5c3d18b0f58bc3f5639de5b2fa47462fe75b45f9b5d9c6efdf59816477accf950cbbe427f950dfb81a8e1f2990be8728e04a2012dc67595 SHA512 b53e41c683b2492e42f7ed0fc5f92ff1ead0e24e6fd4966b314f8d94af63468b7c71345017407e8f95c0f3ed340e58f4e6050c845f2c44f83abd07de0c05d058
 MISC metadata.xml 871 BLAKE2B ffd6aeebf603ed90bfa4cc34d557e947e435d204c84e062532cedecd3e811710d9bd39f9f43dd70afd575104be5661b5f7e7de3f79365a961d45f61835a602c6 SHA512 3ca0916252061c1705d194066a30a8fc19cfe4341911646b7ed797e131e02f40eeddc91c2449a5b049888be749d16a5103e70678e5d6c1604db0ac3fe9f4e0d7
diff --git a/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch b/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch
new file mode 100644
index 000000000000..426dc5a1daa5
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch
@@ -0,0 +1,93 @@
+https://bugs.gentoo.org/888063
+https://github.com/Icinga/icinga2/issues/9618
+https://github.com/Icinga/icinga2/pull/9624
+
+From 5bcbc96e221bb3aafc370449941bfbd70939915c Mon Sep 17 00:00:00 2001
+From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
+Date: Wed, 4 Jan 2023 17:02:19 +0100
+Subject: [PATCH 1/2] Handle boost::beast::http::basic_fields#set() signature
+ change (v1.81)
+
+Make String convertible to boost::beast::string_view (always working),
+not boost::string_view (broken).
+--- a/lib/base/string.cpp
++++ b/lib/base/string.cpp
+@@ -128,15 +128,15 @@ String::operator const std::string&() const
+ }
+ 
+ /**
+- * Conversion function to boost::string_view.
++ * Conversion function to boost::beast::string_view.
+  *
+  * This allows using String as the value for HTTP headers in boost::beast::http::basic_fields::set.
+  *
+- * @return A boost::string_view representing this string.
++ * @return A boost::beast::string_view representing this string.
+  */
+-String::operator boost::string_view() const
++String::operator boost::beast::string_view() const
+ {
+-	return boost::string_view(m_Data);
++	return boost::beast::string_view(m_Data);
+ }
+ 
+ const char *String::CStr() const
+--- a/lib/base/string.hpp
++++ b/lib/base/string.hpp
+@@ -5,6 +5,7 @@
+ 
+ #include "base/i2-base.hpp"
+ #include "base/object.hpp"
++#include <boost/beast/core.hpp>
+ #include <boost/range/iterator.hpp>
+ #include <boost/utility/string_view.hpp>
+ #include <functional>
+@@ -73,7 +74,7 @@ class String
+ 	bool operator<(const String& rhs) const;
+ 
+ 	operator const std::string&() const;
+-	operator boost::string_view() const;
++	operator boost::beast::string_view() const;
+ 
+ 	const char *CStr() const;
+ 
+
+From 99c2d69dc85dfcd044e4a83d4894aa52eedfe09d Mon Sep 17 00:00:00 2001
+From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
+Date: Wed, 4 Jan 2023 17:34:49 +0100
+Subject: [PATCH 2/2] Handle boost::beast::http::basic_fields#operator[]()
+ signature change (v1.81)
+
+Use always working std::string(x), not broken x.to_string().
+(x is a return value.)
+--- a/lib/remote/httphandler.cpp
++++ b/lib/remote/httphandler.cpp
+@@ -58,7 +58,7 @@ void HttpHandler::ProcessRequest(
+ 	Dictionary::Ptr node = m_UrlTree;
+ 	std::vector<HttpHandler::Ptr> handlers;
+ 
+-	Url::Ptr url = new Url(request.target().to_string());
++	Url::Ptr url = new Url(std::string(request.target()));
+ 	auto& path (url->GetPath());
+ 
+ 	for (std::vector<String>::size_type i = 0; i <= path.size(); i++) {
+--- a/lib/remote/httpserverconnection.cpp
++++ b/lib/remote/httpserverconnection.cpp
+@@ -246,7 +246,7 @@ bool HandleAccessControl(
+ 			if (!allowedOrigins.empty()) {
+ 				auto& origin (request[http::field::origin]);
+ 
+-				if (allowedOrigins.find(origin.to_string()) != allowedOrigins.end()) {
++				if (allowedOrigins.find(std::string(origin)) != allowedOrigins.end()) {
+ 					response.set(http::field::access_control_allow_origin, origin);
+ 				}
+ 
+@@ -536,7 +536,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
+ 			if (!authenticatedUser) {
+ 				CpuBoundWork fetchingAuthenticatedUser (yc);
+ 
+-				authenticatedUser = ApiUser::GetByAuthHeader(request[http::field::authorization].to_string());
++				authenticatedUser = ApiUser::GetByAuthHeader(std::string(request[http::field::authorization]));
+ 			}
+ 
+ 			Log logMsg (LogInformation, "HttpServerConnection");
diff --git a/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild b/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
new file mode 100644
index 000000000000..6eb6102ef4c9
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm64 x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+	dev-libs/openssl:0=
+	dev-libs/boost:=[context]
+	console? ( dev-libs/libedit )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl:=
+	acct-user/icinga
+	acct-group/icinga
+	acct-group/icingacmd"
+BDEPEND="
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-boost-1.81.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DICINGA2_RUNDIR=/run
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+		-DUSE_SYSTEMD=$(usex systemd)
+		-DLOGROTATE_HAS_SU=ON
+		-DICINGA2_LTO_BUILD=$(usex lto)
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres)
+			-DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+	if use mysql || use mariadb; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/run" || die "failed to remove /run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners -R icinga:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests
+	fowners -R icinga:icingacmd /var/lib/icinga2/certs
+	fowners icinga:icinga /var/spool/icinga2
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index d319bac921c2..88487e640fb3 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 4f72e4382300..0b04573023f1 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,4 +1,4 @@
 DIST libidn2-2.3.4.tar.gz 2083823 BLAKE2B 26ef58894ad51ca9775cf07edb1353a8aeb7af0df36ce8698425be216a067903797cdbc50c7644292c7e05b23c7bba35c9fe5e38c70e6f55784d8bcdd9c2fdb2 SHA512 a6e90ccef56cfd0b37e3333ab3594bb3cec7ca42a138ca8c4f4ce142da208fa792f6c78ca00c01001c2bc02831abcbaf1cf9bcc346a5290fd7b30708f5a462f3
 DIST libidn2-2.3.4.tar.gz.sig 228 BLAKE2B 0aa25bbd58b76724dc7f6d7a40dd578bf28f4b786c32933fae330c4330da8fabd549c45b579bfc0ef0178b10122e59c6b33bd78a8425c744dff2ace7e75018dd SHA512 d2a575723326ae256a60e3edf7766af65434f716e11f963bb7ac29b6b2ff2872b41684a1bd1c6f3a3921e8a083512eff1faf2b0fc02513095c2bcf3563312fe0
-EBUILD libidn2-2.3.4.ebuild 1366 BLAKE2B a2dad6524f0be69ac65294b3daf04f293977787093095be0c4b04a74aed70217751a216e27a54de2cf84e16d44f078deb0ae08fa7e7cbbd334e6ebb772894114 SHA512 80a70481deedca85bbc565f4c45699cbfd6ceebd4880ef15c2b2c721d03d0747fd4ee08cc7c8795a556680df1d32670ce98c920c2ed4256fa79bca1564859958
+EBUILD libidn2-2.3.4.ebuild 1640 BLAKE2B 648d8b3b72b54c2dd3c9269507c94dea79535364df9256a0c828155770f52c4e0c758cbffd4a995af6f83e0547aaca7950aa5212a5cd0a9d9def99d90af03642 SHA512 7fbb134115ae8f4844d13570e85eed37bcb8e73ed7c8b440634342ad8c96715fe424be589d36979aa2f0e9c39fe717f08daa2307ed5776d89503ce23eb210a9f
 MISC metadata.xml 616 BLAKE2B 8f655a4bf8a19dc46ad2c171a185418193042a5d94e7819cf7366c543f2bab24150715c9966f653cf6efbe1bfcaf4c7f0f2d2bc2cc4c876456e07ef823005953 SHA512 2f23e3e9efc8cabc33337a6c19b0b5d627327538ba3b4e669cac7aa7b424362eae6630249ae162df4d03c833c094affb223f80ee7f914ea87655a45576a11f70
diff --git a/net-dns/libidn2/libidn2-2.3.4.ebuild b/net-dns/libidn2/libidn2-2.3.4.ebuild
index abe76b1078f5..7f65dd252bed 100644
--- a/net-dns/libidn2/libidn2-2.3.4.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit multilib-minimal toolchain-funcs verify-sig
+inherit flag-o-matic multilib-minimal toolchain-funcs verify-sig
 
 DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
 HOMEPAGE="
@@ -37,6 +37,13 @@ BDEPEND="
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libidn.asc
 
 multilib_src_configure() {
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	local myconf=(
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 		$(use_enable static-libs static)
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 26ce43c3bd6f..09dd73a88b24 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 92284b6c5db8..0fb3bd98174c 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,5 +1,5 @@
 AUX libtirpc-1.3.3-release-version.patch 3090 BLAKE2B 3578e2f9ac0dc6479d790c9bf20850d2be18bdfa7819e9f36861b679ce718f84c74dbb79a403fef4f1c7215e5b8e5c14cdc56b9f8b79d4ac3536630fb2d91d12 SHA512 74ff64a9d9c6cb4eb899d43899c7bb306709ecf6748989a056a78296101b6258d287f7f348fde05ce053eacdefe36a62752756cec3e361a9bb5fb671d7598a4f
 DIST libtirpc-1.3.3.tar.bz2 562812 BLAKE2B e229869b05103d912b677f78648dce1f7fa7649bdf44b782a5fb97635eecf07f768bbc0ef25c0f065c8253fbe37c12b80934d9102b7345adfc4102897458b487 SHA512 df0781a74ff9ded2d3c4f5eb7e05496b9f58eac8060c02c68331dc14c4a00304dcd19f46836f5756fe0d9d27095fd463d42dd696fcdff891516711b7d63deabe
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
-EBUILD libtirpc-1.3.3.ebuild 1586 BLAKE2B aa734cf1f4a7b93bc294155417a8fe50563f306ec487ebedb5497dda04d72f01545ded5fe3595d28d867d5646ea94693aff04152b706f8c7cb8ae030fc94632d SHA512 38b222f5f7e7d8d1d1c157746d56a9dd89aaca11d39d39b494b24b304fdc855689c1438d2c371b7df18a7c3a9f75b4827f4bc395f4e009970b5ae1f67ab3a2ca
+EBUILD libtirpc-1.3.3.ebuild 1876 BLAKE2B a7c43b9aa8f21bfdb9027ecba79d820707cb5e0ac11e6a3c468e8b719ffaedfee0b3c30cb3019cb53047d53dac07cdeb5ac243d4d9aa3e5d9d557fea480f6cfd SHA512 400edb880e669a5267228e40abc275925ca92c6a34b3dc1524f8177668d330bbeae0df3c8943c11e454976fd505cd9e960118c94db048335160dc9e3ad6fc960
 MISC metadata.xml 405 BLAKE2B 3006391cb2dac9927f450164f2705d31c35172560ddb436edb76f6c56efc2915a63d57e5be8835801b3b4bbe77526cdaf681b49c4fa43285549b7f0707af4814 SHA512 63489cba710ba40c334508406bf10c28ddc2133cd3eab86afde1670e3d4bb126d0e77abb45c99fd7b6abd438a9e7cc5a10b6742563be51601c7945c87419c928
diff --git a/net-libs/libtirpc/libtirpc-1.3.3.ebuild b/net-libs/libtirpc/libtirpc-1.3.3.ebuild
index 46f43a6d7b8c..1533f24eee74 100644
--- a/net-libs/libtirpc/libtirpc-1.3.3.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit multilib-minimal usr-ldscript
+inherit flag-o-matic multilib-minimal toolchain-funcs usr-ldscript
 
 DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
 HOMEPAGE="https://sourceforge.net/projects/libtirpc/ https://git.linux-nfs.org/?p=steved/libtirpc.git"
@@ -33,6 +33,13 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	local myeconfargs=(
 		$(use_enable kerberos gssapi)
 		$(use_enable static-libs static)
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 11e4a5cdc0b7..754f1c34bcab 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/qmail-autoresponder/Manifest b/net-mail/qmail-autoresponder/Manifest
index a74fcc4ec516..fed882d49940 100644
--- a/net-mail/qmail-autoresponder/Manifest
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -1,6 +1,8 @@
 AUX qmail-autoresponder-0.97-remove-mysql.h.diff 347 BLAKE2B 9f68bfc64c126d1268630b94f309be16dc8cbc157989c5e3d93b721e4d8f809417d516750db555b99f19f25fc604da59c135855d90dd9017ad3cda6df7ba4f07 SHA512 fa1ae38b8c61c1a67c20653b4e19e48946c140496d7380f918818bc18171de36762c70fc664947a22d0fb479f224d16bb2741374e8813ac46768178e3285f7d5
+AUX qmail-autoresponder-2.0-clear-struct.patch 965 BLAKE2B 9a5d4a43fed1cf06e63f3c68f4949a6d55110d5c76034b988282460c38fe51999c8461eeb7f2fe4a95e01897f252254c208bd7b50230efc2a11203c61b38637b SHA512 c8b3b55c18556f3a3870e035100d123bbd5ab2f6added13118b674fa4a9fe867a0d27fbc9dae782c799187c3b937b807dde10b6f86dee11abd3883d09ed5cfab
+AUX qmail-autoresponder-2.0-drop-mysql.patch 637 BLAKE2B 6461da3b84cb5ba82365e31fd488941467ebba278c32b5ecd4f769ba8eb3fc465b3f4c98d5b00a8ac9c94ef5bd26792717c9c084b82743c6fe67a30b609dd729 SHA512 72dbf2f9d19cf796ccf235c761f98f20ef5aff02cb07eee8970d0deb6b53a16661ea19c03aafcb29ae28a8aaccfce66d372c88f096a4b882ef5291f3c4b55065
 DIST qmail-autoresponder-0.97.tar.gz 28158 BLAKE2B b8659f2fd7201a8479b34a43afbbe2efff6a9a72a00167429926564a6323f385b03c3e45c420ac4cea63f52612f9da7acfeacb679f046e1f9019262a9196eb57 SHA512 02bc3afd7a13c9494913986d34c641804c731e26207d32aeff5de36fdbd872d6361872e7ab583d5df1e34fe2a7a35b621337974a2cc71a3283de22f0e6f60916
 DIST qmail-autoresponder-2.0.tar.gz 35463 BLAKE2B 1aa724dd2b0fab0ad62136ea4ef9b65fbb2f3ab567c5dc5676c2be3f52969fa9ebd0b5d0997362a47312efadd97898d56c0721f0f430b51f52cfd6357417fd40 SHA512 d1223b65453cb7c88de5b22a20a961441810e6db1d80ca976599b88cc5771602a678599354b11586e56273c02502b621cfffb610e9ff33632e4a7d7c28766ccb
 EBUILD qmail-autoresponder-0.97-r3.ebuild 1408 BLAKE2B 86a45e618ad1c013db90619fe4aaede21167c4c0f92b4a909a29a3876c90b7f06f8ebed4e482f82e3b122418568d09c9c36d6a31aa4f394a31a8271a938ab5c0 SHA512 3c9410769aafbb7157e623d9f6940143197816b5d3fbf01b01e4db7bc304cb081cad157fa421e37ce637cfdeb8516f6e6880fb98b0643a49abe3675e879ad19c
-EBUILD qmail-autoresponder-2.0.ebuild 1017 BLAKE2B 24ae7c5046738aea9bc4064d17fc6afe52c352e6273978d61b9b3950a92a206499c62c68e0744bcf6c98f620532e1a22f7c1a9c05c1270f9ce19870fb0825f2f SHA512 9bf3f1a7d173af62eb4777e33087910ed695088066470fb88e021c6cd808411f35226129ee8984daaa6f155d0ced7c140b8e19b45b5d6bd6bf8dd2ad3544a384
+EBUILD qmail-autoresponder-2.0-r1.ebuild 1112 BLAKE2B a359f3ea12257e0641dd669c4c578362de4e7f8574288017362ff29aaf9af1c31de5da7770cf5902ec04ad3220a58da2d78513161367f28f66805316b15667ec SHA512 8314b3579f73d840b110a3b5865ae0b6b5b8a05400965e39f1f05d43522cfe8a86ff278d1ae7b67e0c191d46989c2d29da95e54cd538bcf0db34957ec1982ca2
 MISC metadata.xml 416 BLAKE2B 502d2451318fa2dd457011e29cd1ebc52e9081fc280eb15bba4e2551b82f44ada3c59dcad6963f063c6a6c7dbf997c0e6e5478049e3b5bf7582c8245f355fe1e SHA512 3dfb37a7392b7fd7dff681905fdaeb972b296a75574a27b62aa05e1de0d761013633dcc48f914405dfc45ec0d9d31f5c755ad3181a9e0c82c13340b3c0177543
diff --git a/net-mail/qmail-autoresponder/files/qmail-autoresponder-2.0-clear-struct.patch b/net-mail/qmail-autoresponder/files/qmail-autoresponder-2.0-clear-struct.patch
new file mode 100644
index 000000000000..9a43d73465ec
--- /dev/null
+++ b/net-mail/qmail-autoresponder/files/qmail-autoresponder-2.0-clear-struct.patch
@@ -0,0 +1,25 @@
+Patch: https://github.com/bruceg/qmail-autoresponder/commit/baea8ec70d62fbc50868074c050dcb89f1a43f63
+
+From baea8ec70d62fbc50868074c050dcb89f1a43f63 Mon Sep 17 00:00:00 2001
+From: Bruce Guenter <bruce@untroubled.org>
+Date: Fri, 13 Apr 2018 10:39:45 -0600
+Subject: [PATCH] options: Clear time struct before using
+
+The strptime may not set all the fields in struct tm, so we need to
+clear it before parsing, so that mktime doesn't use uninitialized data.
+---
+ options.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/options.c b/options.c
+index 325ea83..ce63867 100644
+--- a/options.c
++++ b/options.c
+@@ -87,6 +87,7 @@ static const char* copy_time(void* ptr, const char* value, unsigned int length)
+   }
+   for (i = 0; i < sizeof time_formats / sizeof *time_formats; i++) {
+     struct tm tm;
++    memset(&tm, 0, sizeof tm);
+     if (strptime(value, time_formats[i], &tm) == value + length) {
+       if ((*dest = mktime(&tm)) != (time_t)-1)
+         return NULL;
diff --git a/net-mail/qmail-autoresponder/files/qmail-autoresponder-2.0-drop-mysql.patch b/net-mail/qmail-autoresponder/files/qmail-autoresponder-2.0-drop-mysql.patch
new file mode 100644
index 000000000000..280e5af722e0
--- /dev/null
+++ b/net-mail/qmail-autoresponder/files/qmail-autoresponder-2.0-drop-mysql.patch
@@ -0,0 +1,21 @@
+Patch: https://github.com/bruceg/qmail-autoresponder/commit/514a15e22d2eaf888592690f6be3e7c7dd18b7d0
+Bug: https://bugs.gentoo.org/740804
+From 514a15e22d2eaf888592690f6be3e7c7dd18b7d0 Mon Sep 17 00:00:00 2001
+From: Bruce Guenter <bruce@untroubled.org>
+Date: Fri, 13 Apr 2018 10:27:03 -0600
+Subject: [PATCH] options: Drop the extraneous #include <mysql/mysql.h>
+
+---
+ options.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/options.c b/options.c
+index 8d1d1e4..325ea83 100644
+--- a/options.c
++++ b/options.c
+@@ -1,5 +1,4 @@
+ #define _XOPEN_SOURCE
+-#include <mysql/mysql.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-2.0.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-2.0-r1.ebuild
index 1fdf92e79e0d..1580fd65df44 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-2.0.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-2.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -14,11 +14,20 @@ LICENSE="GPL-2+"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 IUSE="mysql"
 
-DEPEND=">=dev-libs/bglibs-2.04
-	mysql? ( dev-db/mysql-connector-c:0= )"
-RDEPEND="${DEPEND}
+DEPEND="
+	>=dev-libs/bglibs-2.04
+	mysql? ( dev-db/mysql-connector-c:0= )
+"
+RDEPEND="
+	${DEPEND}
 	virtual/qmail
-	mysql? ( virtual/mysql )"
+	mysql? ( virtual/mysql )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-clear-struct.patch"
+	"${FILESDIR}/${P}-drop-mysql.patch"
+)
 
 src_configure() {
 	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b5274b924db5..41f296ef38aa 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 4fa67491bf6c..58dc08edeeb3 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -8,11 +8,7 @@ AUX openssh-8.6_p1-hpn-version.patch 556 BLAKE2B 26ef960db46c82ee62e6a6f1be15c28
 AUX openssh-8.7_p1-GSSAPI-dns.patch 11576 BLAKE2B 84aa0128ddeccf67e14c20f9d2acb61226c5091a3e3106285c79db4a297dbd781eddf7a6d4cb3b1a5a5dcbbcd158d32dbca5986b6fbf15f62cd3928cf125b083 SHA512 794b06c6ee6acd1bcd861753970cfc4d04f42499d48ff4119746dbcab8643f75761fddb9f52f49fe01e356740eb3882671ac3ae209e0e45745d195a219ffe5dd
 AUX openssh-8.9_p1-allow-ppoll_time64.patch 396 BLAKE2B b5bb202f79699d9037f12155044328f89ee0573efa43da7cdf8511555e706b6bf66cae069ac95cca900779c6ce293eedec48450f786fd033375e9be17bfb2872 SHA512 9b88024e6a898fc85205fbc038274a3271f787276962150965ab8f599fa355ee73cb48e7e12e3f090034293f9dca94a1ce41dfce2aaeb140693545ff3bc391f0
 AUX openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch 419 BLAKE2B c5ef82ed92da96213c84d954541dc3d99040f95a3ce6d81ea585360200128154daaa7717a553a91e693ee11044f11b4a2c3f9f0137c4b92cb1aee01514ec7763 SHA512 cdc0894728e01b132346bf1358b2193d5349f281a086a784a4bbdf1a6ad736632cf4c4fbb900c4ebb6b31a13313ed8660dae95968f4e906d40b2aa0b7a7c2303
-AUX openssh-8.9_p1-hpn-15.2-X509-glue.patch 15810 BLAKE2B 5ef56bee2ce09033d86c5f99a0956d5e3f268dcf18cc4bb32c75de9e81c3873efe643c39d155188cca4812e677223d66621b061897308ed66bbbc1793343519e SHA512 a1903c6ab7842a14d1324e6ea3b1a25cc161e564092ed4679b333a081f1659712a519335fb2cfbdd344bded47a00d538bb5b5a9bfd2e82a321a8347cfeb5bb16
-AUX openssh-8.9_p1-hpn-15.2-glue.patch 8473 BLAKE2B a4616e498db7400702b3c0ba8c6eb6d58b198b1104215b91c0938bb68bf15850f63e3f32e4b99af04ae78ef60818127e17cab68dc3e3bbfe696545057ef3ec63 SHA512 ceff7521accb464c916b5aa695c80de5760272da319f537dc93bb6b6e39de1d408ba4a5335b4071091afb360c5cf44d91429109f84f1e669a175beb3cfcecd26
-AUX openssh-9.0_p1-X509-glue-13.4.1.patch 2118 BLAKE2B 171c776e8a1dc64dd63d0e471dd7064fb0360a4abdec7f03915246f07082341e6b505e7a5467aad25bd5282ab4a63a48405984317b12c1692d04f5427503a86b SHA512 7dc1c43e6f70a4c990dc3cf493f8a5b4fbdf1753f2d4bf474ba40adb656d843fcf72a4e076e6450e0488ada68758f9e2e0814a71388d552ce50d34c3692e573d
 AUX openssh-9.0_p1-X509-uninitialized-delay.patch 321 BLAKE2B 19bff0fc7ecdc6350f8e6bd30f36f30b455c65b7455fe8b1d481d8fa7cdfa7cc76719931857fe2c9730b05ae8fe3e7e05c538e743e055d6594dd2fc7c3f250ee SHA512 57798621a51a60abf6985391ec73dcafdb46de75c93579e23b786aa095d8eea29ebd9ab5987b951a136b15e60896332c9717c82b42e1c22b345444aedf17a9f5
-AUX openssh-9.0_p1-implicit-func-decl-vsnprintf.patch 2071 BLAKE2B 412277bf109e93e785c2d81830d11697e1718992204177aa5048c4a86f0d62982a5a3af0f7b7ef92e3b506f6afe428953fe5e6cbe0f9a27a3fbc760d536d0fd9 SHA512 d42cd6da269e3d44da2230a3597808f522d73c8d8ddc15617b43dbd922587e6a90a81f686a816313330b02a53d0da517d563f134d6281adcc7d85d9666dd07b2
 AUX openssh-9.1_p1-build-tests.patch 529 BLAKE2B cb511de87f2483918d4a5b5ad267a5e3d1e579ed8c2a9e5d477c319091a66db1f62ff43e8dbf273d7b1a1b57e8acce59e06a7dfa85a977a890ec80ad025519c7 SHA512 87df8d4c722fbc0a65aac682199069dc530f81702e84352b689592a94acee8678b0a134e81ac57e1758d6b392c6b63bc21dab3d8c3effd6fe3ae41fb26dd3301
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
diff --git a/net-misc/openssh/files/openssh-8.9_p1-hpn-15.2-X509-glue.patch b/net-misc/openssh/files/openssh-8.9_p1-hpn-15.2-X509-glue.patch
deleted file mode 100644
index a98e1adcb54c..000000000000
--- a/net-misc/openssh/files/openssh-8.9_p1-hpn-15.2-X509-glue.patch
+++ /dev/null
@@ -1,431 +0,0 @@
-diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff
---- a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff	2022-02-24 18:48:19.078457000 -0800
-+++ b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff	2022-02-24 18:49:22.195632128 -0800
-@@ -3,9 +3,9 @@
- --- a/Makefile.in
- +++ b/Makefile.in
- @@ -46,7 +46,7 @@ CFLAGS=@CFLAGS@
-- CFLAGS_NOPIE=@CFLAGS_NOPIE@
-- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
-- PICFLAG=@PICFLAG@
-+ LD=@LD@
-+ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA)
-+ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
- -LIBS=@LIBS@
- +LIBS=@LIBS@ -lpthread
-  K5LIBS=@K5LIBS@
-@@ -803,8 +803,8 @@
-  ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out)
-  {
-  	struct session_state *state;
---	const struct sshcipher *none = cipher_by_name("none");
--+	struct sshcipher *none = cipher_by_name("none");
-+-	const struct sshcipher *none = cipher_none();
-++	struct sshcipher *none = cipher_none();
-  	int r;
-  
-  	if (none == NULL) {
-@@ -894,24 +894,24 @@
-  		intptr = &options->compression;
-  		multistate_ptr = multistate_compression;
- @@ -2272,6 +2278,7 @@ initialize_options(Options * options)
-- 	options->revoked_host_keys = NULL;
-  	options->fingerprint_hash = -1;
-  	options->update_hostkeys = -1;
-+	options->known_hosts_command = NULL;
- +	options->disable_multithreaded = -1;
-- 	options->hostbased_accepted_algos = NULL;
-- 	options->pubkey_accepted_algos = NULL;
-- 	options->known_hosts_command = NULL;
-+ }
-+ 
-+ /*
- @@ -2467,6 +2474,10 @@ fill_default_options(Options * options)
-+ 		options->update_hostkeys = 0;
-  	if (options->sk_provider == NULL)
-  		options->sk_provider = xstrdup("$SSH_SK_PROVIDER");
-- #endif
- +	if (options->update_hostkeys == -1)
- +		options->update_hostkeys = 0;
- +	if (options->disable_multithreaded == -1)
- +		options->disable_multithreaded = 0;
-  
-- 	/* Expand KEX name lists */
-- 	all_cipher = cipher_alg_list(',', 0);
-+ 	/* expand KEX and etc. name lists */
-+ {	char *all;
- diff --git a/readconf.h b/readconf.h
- index 2fba866e..7f8f0227 100644
- --- a/readconf.h
-@@ -950,9 +950,9 @@
-  	/* Portable-specific options */
-  	sUsePAM,
- +	sDisableMTAES,
-- 	/* Standard Options */
-- 	sPort, sHostKeyFile, sLoginGraceTime,
-- 	sPermitRootLogin, sLogFacility, sLogLevel, sLogVerbose,
-+ 	/* X.509 Standard Options */
-+ 	sHostbasedAlgorithms,
-+ 	sPubkeyAlgorithms,
- @@ -662,6 +666,7 @@ static struct {
-  	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
-  	{ "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL },
-diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff
---- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2022-02-24 18:48:19.078457000 -0800
-+++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2022-02-24 18:54:51.800546480 -0800
-@@ -157,6 +157,36 @@
- +	 Allan Jude provided the code for the NoneMac and buffer normalization.
- +         This work was financed, in part, by Cisco System, Inc., the National
- +         Library of Medicine, and the National Science Foundation.
-+diff --git a/auth2.c b/auth2.c
-+--- a/auth2.c	2021-03-15 19:30:45.404060786 -0700
-++++ b/auth2.c	2021-03-15 19:37:22.078476597 -0700
-+@@ -229,16 +229,17 @@
-+ 	double delay;
-+ 
-+ 	digest_alg = ssh_digest_maxbytes();
-+-	len = ssh_digest_bytes(digest_alg);
-+-	hash = xmalloc(len);
-++	if (len = ssh_digest_bytes(digest_alg) > 0) {
-++		hash = xmalloc(len);
-+ 
-+-	(void)snprintf(b, sizeof b, "%llu%s",
-+-	    (unsigned long long)options.timing_secret, user);
-+-	if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0)
-+-		fatal_f("ssh_digest_memory");
-+-	/* 0-4.2 ms of delay */
-+-	delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000;
-+-	freezero(hash, len);
-++		(void)snprintf(b, sizeof b, "%llu%s",
-++		    (unsigned long long)options.timing_secret, user);
-++		if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0)
-++			fatal_f("ssh_digest_memory");
-++		/* 0-4.2 ms of delay */
-++		delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000;
-++		freezero(hash, len);
-++	}
-+ 	debug3_f("user specific delay %0.3lfms", delay/1000);
-+ 	return MIN_FAIL_DELAY_SECONDS + delay;
-+ }
- diff --git a/channels.c b/channels.c
- index b60d56c4..0e363c15 100644
- --- a/channels.c
-@@ -209,14 +239,14 @@
-  static void
-  channel_pre_open(struct ssh *ssh, Channel *c,
-      fd_set *readset, fd_set *writeset)
--@@ -2120,22 +2147,32 @@ channel_check_window(struct ssh *ssh, Channel *c)
-+@@ -2164,21 +2191,31 @@ channel_check_window(struct ssh *ssh, Channel *c)
-  
-  	if (c->type == SSH_CHANNEL_OPEN &&
-  	    !(c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD)) &&
- -	    ((c->local_window_max - c->local_window >
- -	    c->local_maxpacket*3) ||
--+            ((ssh_packet_is_interactive(ssh) &&
--+            c->local_window_max - c->local_window > c->local_maxpacket*3) ||
-++	    ((ssh_packet_is_interactive(ssh) &&
-++	    c->local_window_max - c->local_window > c->local_maxpacket*3) ||
-  	    c->local_window < c->local_window_max/2) &&
-  	    c->local_consumed > 0) {
- +		u_int addition = 0;
-@@ -235,9 +265,8 @@
-  		    (r = sshpkt_put_u32(ssh, c->remote_id)) != 0 ||
- -		    (r = sshpkt_put_u32(ssh, c->local_consumed)) != 0 ||
- +		    (r = sshpkt_put_u32(ssh, c->local_consumed + addition)) != 0 ||
-- 		    (r = sshpkt_send(ssh)) != 0) {
-- 			fatal_fr(r, "channel %i", c->self);
-- 		}
-+ 		    (r = sshpkt_send(ssh)) != 0)
-+ 			fatal_fr(r, "channel %d", c->self);
- -		debug2("channel %d: window %d sent adjust %d", c->self,
- -		    c->local_window, c->local_consumed);
- -		c->local_window += c->local_consumed;
-@@ -337,70 +366,92 @@
- index 70f492f8..5503af1d 100644
- --- a/clientloop.c
- +++ b/clientloop.c
--@@ -1578,9 +1578,11 @@ client_request_x11(struct ssh *ssh, const char *request_type, int rchan)
-+@@ -1578,10 +1578,11 @@ client_request_x11(struct ssh *ssh, const char *request_type, int rchan)
-  	sock = x11_connect_display(ssh);
-  	if (sock < 0)
-  		return NULL;
- -	c = channel_new(ssh, "x11",
- -	    SSH_CHANNEL_X11_OPEN, sock, sock, -1,
---	    CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", 1);
--+        c = channel_new(ssh, "x11",
--+			SSH_CHANNEL_X11_OPEN, sock, sock, -1,
--+			/* again is this really necessary for X11? */
--+			options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size,
--+			CHAN_X11_PACKET_DEFAULT, 0, "x11", 1);
-+-	    CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11",
-+-	    CHANNEL_NONBLOCK_SET);
-++	c = channel_new(ssh, "x11",
-++	    SSH_CHANNEL_X11_OPEN, sock, sock, -1,
-++	    /* again is this really necessary for X11? */
-++	    options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size,
-++	    CHAN_X11_PACKET_DEFAULT, 0, "x11", CHANNEL_NONBLOCK_SET);
-  	c->force_drain = 1;
-  	return c;
-  }
--@@ -1608,9 +1610,10 @@ client_request_agent(struct ssh *ssh, const char *request_type, int rchan)
-+@@ -1608,9 +1609,10 @@ client_request_agent(struct ssh *ssh, const char *request_type, int rchan)
-  		return NULL;
-  	}
-  	c = channel_new(ssh, "authentication agent connection",
- -	    SSH_CHANNEL_OPEN, sock, sock, -1,
- -	    CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0,
---	    "authentication agent connection", 1);
--+			SSH_CHANNEL_OPEN, sock, sock, -1,
--+			options.hpn_disabled ? CHAN_X11_WINDOW_DEFAULT : options.hpn_buffer_size,
--+			CHAN_TCP_PACKET_DEFAULT, 0,
--+			"authentication agent connection", 1);
-+-	    "authentication agent connection", CHANNEL_NONBLOCK_SET);
-++	    SSH_CHANNEL_OPEN, sock, sock, -1,
-++	    options.hpn_disabled ? CHAN_X11_WINDOW_DEFAULT : options.hpn_buffer_size,
-++	    CHAN_TCP_PACKET_DEFAULT, 0,
-++	    "authentication agent connection", CHANNEL_NONBLOCK_SET);
-  	c->force_drain = 1;
-  	return c;
-  }
--@@ -1635,10 +1638,13 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode,
-+@@ -1635,9 +1637,9 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode,
-  	}
-  	debug("Tunnel forwarding using interface %s", ifname);
-  
- -	c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1,
---	    CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1);
--+        c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1,
-+-	    CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun",
-+-	    CHANNEL_NONBLOCK_SET);
-++	c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1,
- +	    options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size,
--+	    CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1);
-++	    CHAN_TCP_PACKET_DEFAULT, 0, "tun", CHANNEL_NONBLOCK_SET);
-  	c->datagram = 1;
-  
--+
--+
-  #if defined(SSH_TUN_FILTER)
-- 	if (options.tun_open == SSH_TUNMODE_POINTOPOINT)
-- 		channel_register_filter(ssh, c->self, sys_tun_infilter,
- diff --git a/compat.c b/compat.c
- index 69befa96..90b5f338 100644
- --- a/compat.c
- +++ b/compat.c
--@@ -149,6 +149,14 @@ compat_banner(struct ssh *ssh, const char *version)
-- 			debug_f("match: %s pat %s compat 0x%08x",
-+@@ -43,7 +43,7 @@ compat_datafellows(const char *version)
-+ static u_int
-+ compat_datafellows(const char *version)
-+ {
-+-	int i;
-++	int i, bugs = 0;
-+ 	static struct {
-+ 		char	*pat;
-+ 		int	bugs;
-+@@ -147,11 +147,26 @@
-+ 		if (match_pattern_list(version, check[i].pat, 0) == 1) {
-+ 			debug("match: %s pat %s compat 0x%08x",
-  			    version, check[i].pat, check[i].bugs);
-- 			ssh->compat = check[i].bugs;
- +			/* Check to see if the remote side is OpenSSH and not HPN */
--+			/* TODO: need to use new method to test for this */
- +			if (strstr(version, "OpenSSH") != NULL) {
- +				if (strstr(version, "hpn") == NULL) {
--+					ssh->compat |= SSH_BUG_LARGEWINDOW;
-++					bugs |= SSH_BUG_LARGEWINDOW;
- +					debug("Remote is NON-HPN aware");
- +				}
- +			}
-- 			return;
-+-			return check[i].bugs;
-++			bugs |= check[i].bugs;
-  		}
-  	}
-+-	debug("no match: %s", version);
-+-	return 0;
-++	/* Check to see if the remote side is OpenSSH and not HPN */
-++	if (strstr(version, "OpenSSH") != NULL) {
-++		if (strstr(version, "hpn") == NULL) {
-++			bugs |= SSH_BUG_LARGEWINDOW;
-++			debug("Remote is NON-HPN aware");
-++		}
-++	}
-++	if (bugs == 0)
-++		debug("no match: %s", version);
-++	return bugs;
-+ }
-+ 
-+ char *
- diff --git a/compat.h b/compat.h
- index c197fafc..ea2e17a7 100644
- --- a/compat.h
-@@ -459,7 +510,7 @@
- @@ -890,6 +890,10 @@ kex_choose_conf(struct ssh *ssh)
-  	int nenc, nmac, ncomp;
-  	u_int mode, ctos, need, dh_need, authlen;
-- 	int r, first_kex_follows;
-+ 	int r, first_kex_follows = 0;
- +	int auth_flag = 0;
- +
- +	auth_flag = packet_authentication_state(ssh);
-@@ -553,10 +604,10 @@
-  #define MAX_PACKETS	(1U<<31)
-  static int
-  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
--@@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
-+@@ -1317,7 +1336,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
-+ {
-  	struct session_state *state = ssh->state;
-  	int len, r, ms_remain;
-- 	struct pollfd pfd;
- -	char buf[8192];
- +	char buf[SSH_IOBUFSZ];
-  	struct timeval start;
-@@ -1072,7 +1123,7 @@
- +	else
- +		options.hpn_buffer_size = 2 * 1024 * 1024;
- +
--+	if (ssh->compat & SSH_BUG_LARGEWINDOW) {
-++	if (ssh_compat_fellows(ssh, SSH_BUG_LARGEWINDOW)) {
- +		debug("HPN to Non-HPN Connection");
- +	} else {
- +		int sock, socksize;
-@@ -1136,14 +1187,14 @@
-  	}
- @@ -2089,6 +2167,11 @@ ssh_session2_open(struct ssh *ssh)
-  	    window, packetmax, CHAN_EXTENDED_WRITE,
-- 	    "client-session", /*nonblock*/0);
-+ 	    "client-session", CHANNEL_NONBLOCK_STDIO);
-  
- +	if ((options.tcp_rcv_buf_poll > 0) && !options.hpn_disabled) {
- +		c->dynamic_window = 1;
- +		debug("Enabled Dynamic Window Scaling");
- +	}
- +
-- 	debug3_f("channel_new: %d", c->self);
-+ 	debug2_f("channel %d", c->self);
-  
-  	channel_send_open(ssh, c->self);
- @@ -2105,6 +2188,13 @@ ssh_session2(struct ssh *ssh, const struct ssh_conn_info *cinfo)
-@@ -1314,7 +1365,29 @@
-  		/* Bind the socket to the desired port. */
-  		if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) {
-  			error("Bind to port %s on %s failed: %.200s.",
--@@ -1727,6 +1734,19 @@ main(int ac, char **av)
-+@@ -1625,13 +1632,14 @@
-+ 		if (ssh_digest_update(ctx, sshbuf_ptr(server_cfg),
-+ 		    sshbuf_len(server_cfg)) != 0)
-+ 			fatal_f("ssh_digest_update");
-+-		len = ssh_digest_bytes(digest_alg);
-+-		hash = xmalloc(len);
-+-		if (ssh_digest_final(ctx, hash, len) != 0)
-+-			fatal_f("ssh_digest_final");
-+-		options.timing_secret = PEEK_U64(hash);
-+-		freezero(hash, len);
-+-		ssh_digest_free(ctx);
-++		if ((len = ssh_digest_bytes(digest_alg)) > 0) {
-++			hash = xmalloc(len);
-++			if (ssh_digest_final(ctx, hash, len) != 0)
-++				fatal_f("ssh_digest_final");
-++			options.timing_secret = PEEK_U64(hash);
-++			freezero(hash, len);
-++			ssh_digest_free(ctx);
-++		}
-+ 		ctx = NULL;
-+ 		return;
-+ 	}
-+@@ -1727,6 +1735,19 @@ main(int ac, char **av)
-  		fatal("AuthorizedPrincipalsCommand set without "
-  		    "AuthorizedPrincipalsCommandUser");
-  
-@@ -1334,7 +1407,7 @@
-  	/*
-  	 * Check whether there is any path through configured auth methods.
-  	 * Unfortunately it is not possible to verify this generally before
--@@ -2166,6 +2186,9 @@ main(int ac, char **av)
-+@@ -2166,6 +2187,9 @@ main(int ac, char **av)
-  	    rdomain == NULL ? "" : "\"");
-  	free(laddr);
-  
-@@ -1344,7 +1417,7 @@
-  	/*
-  	 * We don't want to listen forever unless the other side
-  	 * successfully authenticates itself.  So we set up an alarm which is
--@@ -2343,6 +2366,12 @@ do_ssh2_kex(struct ssh *ssh)
-+@@ -2343,6 +2367,12 @@ do_ssh2_kex(struct ssh *ssh)
-  	struct kex *kex;
-  	int r;
-  
-@@ -1384,14 +1457,3 @@
-  # Example of overriding settings on a per-user basis
-  #Match User anoncvs
-  #	X11Forwarding no
--diff --git a/version.h b/version.h
--index 6b4fa372..332fb486 100644
----- a/version.h
--+++ b/version.h
--@@ -3,4 +3,5 @@
-- #define SSH_VERSION	"OpenSSH_8.5"
-- 
-- #define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
--+#define SSH_HPN         "-hpn15v2"
--+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
-diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-PeakTput-15.2.diff b/openssh-8_5_P1-hpn-PeakTput-15.2.diff
---- a/openssh-8_5_P1-hpn-PeakTput-15.2.diff	2022-02-24 18:48:19.078457000 -0800
-+++ b/openssh-8_5_P1-hpn-PeakTput-15.2.diff	2022-02-24 18:49:22.196632131 -0800
-@@ -12,9 +12,9 @@
-  static long stalled;		/* how long we have been stalled */
-  static int bytes_per_second;	/* current speed in bytes per second */
- @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update)
-+ 	off_t bytes_left;
-  	int cur_speed;
-- 	int hours, minutes, seconds;
-- 	int file_len;
-+ 	int len;
- +	off_t delta_pos;
-  
-  	if ((!force_update && !alarm_fired && !win_resized) || !can_output())
-@@ -30,15 +30,17 @@
-  	if (bytes_left > 0)
-  		elapsed = now - last_update;
-  	else {
--@@ -166,7 +173,7 @@ refresh_progress_meter(int force_update)
-- 
-+@@ -166,8 +173,8 @@ refresh_progress_meter(int force_update)
-+ 	buf[1] = '\0';
-+
-  	/* filename */
-- 	buf[0] = '\0';
---	file_len = win_size - 36;
--+	file_len = win_size - 45;
-- 	if (file_len > 0) {
-- 		buf[0] = '\r';
-- 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s",
-+-	if (win_size > 36) {
-++	if (win_size > 45) {
-+-		int file_len = win_size - 36;
-++		int file_len = win_size - 45;
-+ 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ",
-+ 		    file_len, file);
-+ 	}
- @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update)
-  	    (off_t)bytes_per_second);
-  	strlcat(buf, "/s ", win_size);
-@@ -63,15 +65,3 @@
-  }
-  
-  /*ARGSUSED*/
--diff --git a/ssh-keygen.c b/ssh-keygen.c
--index cfb5f115..986ff59b 100644
----- a/ssh-keygen.c
--+++ b/ssh-keygen.c
--@@ -2959,7 +2959,6 @@ do_download_sk(const char *skprovider, const char *device)
-- 
-- 	if (skprovider == NULL)
-- 		fatal("Cannot download keys without provider");
---
-- 	pin = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN);
-- 	if (!quiet) {
-- 		printf("You may need to touch your authenticator "
diff --git a/net-misc/openssh/files/openssh-8.9_p1-hpn-15.2-glue.patch b/net-misc/openssh/files/openssh-8.9_p1-hpn-15.2-glue.patch
deleted file mode 100644
index 272270b7e985..000000000000
--- a/net-misc/openssh/files/openssh-8.9_p1-hpn-15.2-glue.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff
---- a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff	2022-02-23 17:10:24.843395097 -0800
-+++ b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff	2022-02-23 17:10:38.206451595 -0800
-@@ -1026,9 +1026,9 @@
- +	}
- +#endif
- +
-- 	debug("Authentication succeeded (%s).", authctxt.method->name);
-- }
-- 
-+ 	if (ssh_packet_connection_is_on_socket(ssh)) {
-+ 		verbose("Authenticated to %s ([%s]:%d) using \"%s\".", host,
-+ 		    ssh_remote_ipaddr(ssh), ssh_remote_port(ssh),
- diff --git a/sshd.c b/sshd.c
- index 6277e6d6..bf3d6e4a 100644
- --- a/sshd.c
-diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff
---- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2022-02-23 17:08:38.124943587 -0800
-+++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff	2022-02-23 17:20:59.432070316 -0800
-@@ -536,18 +536,10 @@
-  	if (state->rekey_limit)
-  		*max_blocks = MINIMUM(*max_blocks,
-  		    state->rekey_limit / enc->block_size);
--@@ -954,6 +963,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
-+@@ -954,6 +963,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
-  	return 0;
-  }
-  
--+/* this supports the forced rekeying required for the NONE cipher */
--+int rekey_requested = 0;
--+void
--+packet_request_rekeying(void)
--+{
--+	rekey_requested = 1;
--+}
--+
- +/* used to determine if pre or post auth when rekeying for aes-ctr
- + * and none cipher switch */
- +int
-@@ -561,27 +553,14 @@
-  #define MAX_PACKETS	(1U<<31)
-  static int
-  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
--@@ -980,6 +1007,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
-- 	if (state->p_send.packets == 0 && state->p_read.packets == 0)
-- 		return 0;
-- 
--+	/* used to force rekeying when called for by the none
--+         * cipher switch methods -cjr */
--+        if (rekey_requested == 1) {
--+                rekey_requested = 0;
--+                return 1;
--+        }
--+
-- 	/* Time-based rekeying */
-- 	if (state->rekey_interval != 0 &&
-- 	    (int64_t)state->rekey_time + state->rekey_interval <= monotime())
- @@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
-  	struct session_state *state = ssh->state;
-  	int len, r, ms_remain;
-- 	fd_set *setp;
-+ 	struct pollfd pfd;
- -	char buf[8192];
- +	char buf[SSH_IOBUFSZ];
-- 	struct timeval timeout, start, *timeoutp = NULL;
-+ 	struct timeval start;
-+ 	struct timespec timespec, *timespecp = NULL;
-  
-  	DBG(debug("packet_read()"));
- diff --git a/packet.h b/packet.h
-@@ -598,12 +577,11 @@
-  };
-  
-  typedef int (ssh_packet_hook_fn)(struct ssh *, struct sshbuf *,
--@@ -155,6 +158,10 @@ int	 ssh_packet_inc_alive_timeouts(struct ssh *);
-+@@ -155,6 +158,9 @@ int	 ssh_packet_inc_alive_timeouts(struct ssh *);
-  int	 ssh_packet_set_maxsize(struct ssh *, u_int);
-  u_int	 ssh_packet_get_maxsize(struct ssh *);
-  
- +/* for forced packet rekeying post auth */
--+void	 packet_request_rekeying(void);
- +int	 packet_authentication_state(const struct ssh *);
- +
-  int	 ssh_packet_get_state(struct ssh *, struct sshbuf *);
-@@ -627,9 +605,9 @@
-  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
- +	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
- +	oNoneEnabled, oNoneMacEnabled, oNoneSwitch,
-+ 	oDisableMTAES,
-  	oVisualHostKey,
-  	oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
-- 	oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
- @@ -297,6 +300,9 @@ static struct {
-  	{ "kexalgorithms", oKexAlgorithms },
-  	{ "ipqos", oIPQoS },
-@@ -637,9 +615,9 @@
- +	{ "noneenabled", oNoneEnabled },
- +	{ "nonemacenabled", oNoneMacEnabled },
- +	{ "noneswitch", oNoneSwitch },
-- 	{ "proxyusefdpass", oProxyUseFdpass },
-- 	{ "canonicaldomains", oCanonicalDomains },
-- 	{ "canonicalizefallbacklocal", oCanonicalizeFallbackLocal },
-+ 	{ "sessiontype", oSessionType },
-+ 	{ "stdinnull", oStdinNull },
-+ 	{ "forkafterauthentication", oForkAfterAuthentication },
- @@ -317,6 +323,11 @@ static struct {
-  	{ "securitykeyprovider", oSecurityKeyProvider },
-  	{ "knownhostscommand", oKnownHostsCommand },
-@@ -717,9 +695,9 @@
- +	options->hpn_buffer_size = -1;
- +	options->tcp_rcv_buf_poll = -1;
- +	options->tcp_rcv_buf = -1;
-- 	options->proxy_use_fdpass = -1;
-- 	options->ignored_unknown = NULL;
-- 	options->num_canonical_domains = 0;
-+ 	options->session_type = -1;
-+ 	options->stdin_null = -1;
-+ 	options->fork_after_authentication = -1;
- @@ -2426,6 +2484,41 @@ fill_default_options(Options * options)
-  		options->server_alive_interval = 0;
-  	if (options->server_alive_count_max == -1)
-@@ -778,9 +756,9 @@
-  	int	ip_qos_bulk;		/* IP ToS/DSCP/class for bulk traffic */
-  	SyslogFacility log_facility;	/* Facility for system logging. */
- @@ -120,7 +124,11 @@ typedef struct {
-- 
-  	int	enable_ssh_keysign;
-  	int64_t rekey_limit;
-+ 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
- +	int     none_switch;    /* Use none cipher */
- +	int     none_enabled;   /* Allow none cipher to be used */
- +  	int     nonemac_enabled;   /* Allow none MAC to be used */
-@@ -842,9 +820,9 @@
-  	/* Portable-specific options */
-  	if (options->use_pam == -1)
- @@ -424,6 +434,49 @@ fill_default_server_options(ServerOptions *options)
-- 	}
-- 	if (options->permit_tun == -1)
-  		options->permit_tun = SSH_TUNMODE_NO;
-+ 	if (options->disable_multithreaded == -1)
-+ 		options->disable_multithreaded = 0;
- +	if (options->none_enabled == -1)
- +		options->none_enabled = 0;
- +	if (options->nonemac_enabled == -1)
-@@ -975,15 +953,6 @@
- index 306658cb..d4309903 100644
- --- a/serverloop.c
- +++ b/serverloop.c
--@@ -322,7 +322,7 @@ static int
-- process_input(struct ssh *ssh, fd_set *readset, int connection_in)
-- {
-- 	int r, len;
---	char buf[16384];
--+	char buf[SSH_IOBUFSZ];
-- 
-- 	/* Read and buffer any input data from the client. */
-- 	if (FD_ISSET(connection_in, readset)) {
- @@ -608,7 +608,8 @@ server_request_tun(struct ssh *ssh)
-  	debug("Tunnel forwarding using interface %s", ifname);
-  
-@@ -1047,30 +1016,17 @@
-  Note that
- diff --git a/sftp.c b/sftp.c
- index fb3c08d1..89bebbb2 100644
----- a/sftp.c
--+++ b/sftp.c
--@@ -71,7 +71,7 @@ typedef void EditLine;
-- #include "sftp-client.h"
-- 
-- #define DEFAULT_COPY_BUFLEN	32768	/* Size of buffer for up/download */
---#define DEFAULT_NUM_REQUESTS	64	/* # concurrent outstanding requests */
--+#define DEFAULT_NUM_REQUESTS	256	/* # concurrent outstanding requests */
-- 
-- /* File to read commands from */
-- FILE* infile;
--diff --git a/ssh-keygen.c b/ssh-keygen.c
--index cfb5f115..36a6e519 100644
----- a/ssh-keygen.c
--+++ b/ssh-keygen.c
--@@ -2971,7 +2971,7 @@ do_download_sk(const char *skprovider, const char *device)
-- 			freezero(pin, strlen(pin));
-- 		error_r(r, "Unable to load resident keys");
-- 		return -1;
---	}
--+ 	}
-- 	if (nkeys == 0)
-- 		logit("No keys to download");
-- 	if (pin != NULL)
-+--- a/sftp-client.c
-++++ b/sftp-client.c
-+@@ -65,7 +65,7 @@ typedef void EditLine;
-+ #define DEFAULT_COPY_BUFLEN	32768
-+ 
-+ /* Default number of concurrent outstanding requests */
-+-#define DEFAULT_NUM_REQUESTS	64
-++#define DEFAULT_NUM_REQUESTS	256
-+ 
-+ /* Minimum amount of data to read at a time */
-+ #define MIN_READ_SIZE	512
- diff --git a/ssh.c b/ssh.c
- index 53330da5..27b9770e 100644
- --- a/ssh.c
-@@ -1330,9 +1286,9 @@
- +		}
- +	}
- +
-- 	debug("Authentication succeeded (%s).", authctxt.method->name);
-- }
-  
-+ #ifdef WITH_OPENSSL
-+ 	if (options.disable_multithreaded == 0) {
- diff --git a/sshd.c b/sshd.c
- index 6277e6d6..d66fa41a 100644
- --- a/sshd.c
-@@ -1359,8 +1315,8 @@
-  		if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) {
-  			error("Bind to port %s on %s failed: %.200s.",
- @@ -1727,6 +1734,19 @@ main(int ac, char **av)
-- 	/* Fill in default values for those options not explicitly set. */
-- 	fill_default_server_options(&options);
-+ 		fatal("AuthorizedPrincipalsCommand set without "
-+ 		    "AuthorizedPrincipalsCommandUser");
-  
- +	if (options.none_enabled == 1) {
- +		char *old_ciphers = options.ciphers;
-@@ -1375,9 +1331,9 @@
- +		}
- +	}
- +
-- 	/* challenge-response is implemented via keyboard interactive */
-- 	if (options.challenge_response_authentication)
-- 		options.kbd_interactive_authentication = 1;
-+ 	/*
-+ 	 * Check whether there is any path through configured auth methods.
-+ 	 * Unfortunately it is not possible to verify this generally before
- @@ -2166,6 +2186,9 @@ main(int ac, char **av)
-  	    rdomain == NULL ? "" : "\"");
-  	free(laddr);
diff --git a/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch b/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch
deleted file mode 100644
index dc93182e1d4c..000000000000
--- a/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ur '--exclude=.*.un~' a/openssh-9.0p1+x509-13.4.1.diff b/openssh-9.0p1+x509-13.4.1.diff
---- a/openssh-9.0p1+x509-13.4.1.diff	2022-06-23 10:43:33.957093896 -0700
-+++ b/openssh-9.0p1+x509-13.4.1.diff	2022-06-23 10:44:17.232396805 -0700
-@@ -48941,8 +48941,8 @@
-  		gss_create_empty_oid_set(&status, &oidset);
-  		gss_add_oid_set_member(&status, ctx->oid, &oidset);
-  
---		if (gethostname(lname, MAXHOSTNAMELEN)) {
--+		if (gethostname(lname, MAXHOSTNAMELEN) == -1) {
-+-		if (gethostname(lname, HOST_NAME_MAX)) {
-++		if (gethostname(lname, HOST_NAME_MAX) == -1) {
-  			gss_release_oid_set(&status, &oidset);
-  			return (-1);
-  		}
-@@ -57102,12 +57102,11 @@
-  
-  install-files:
-  	$(MKDIR_P) $(DESTDIR)$(bindir)
--@@ -395,6 +372,8 @@
-+@@ -395,6 +372,7 @@
-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
-  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
- +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
--+	$(MKDIR_P) $(DESTDIR)$(piddir)
-  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
-@@ -78638,7 +78637,7 @@
- +if test "$sshd_type" = "pkix" ; then
- +  unset_arg=''
- +else
--+  unset_arg=none
-++  unset_arg=''
- +fi
- +
-  cat > $OBJ/sshd_config.i << _EOF
-@@ -143777,16 +143776,6 @@
- +int	 asnmprintf(char **, size_t, int *, const char *, ...)
-  	    __attribute__((format(printf, 4, 5)));
-  void	 msetlocale(void);
--diff -ruN openssh-9.0p1/version.h openssh-9.0p1+x509-13.4.1/version.h
----- openssh-9.0p1/version.h	2022-04-06 03:47:48.000000000 +0300
--+++ openssh-9.0p1+x509-13.4.1/version.h	2022-06-23 09:07:00.000000000 +0300
--@@ -2,5 +2,4 @@
-- 
-- #define SSH_VERSION	"OpenSSH_9.0"
-- 
---#define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
--+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
- diff -ruN openssh-9.0p1/version.m4 openssh-9.0p1+x509-13.4.1/version.m4
- --- openssh-9.0p1/version.m4	1970-01-01 02:00:00.000000000 +0200
- +++ openssh-9.0p1+x509-13.4.1/version.m4	2022-06-23 09:07:00.000000000 +0300
diff --git a/net-misc/openssh/files/openssh-9.0_p1-implicit-func-decl-vsnprintf.patch b/net-misc/openssh/files/openssh-9.0_p1-implicit-func-decl-vsnprintf.patch
deleted file mode 100644
index c3a464eb3fe8..000000000000
--- a/net-misc/openssh/files/openssh-9.0_p1-implicit-func-decl-vsnprintf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://github.com/openssh/openssh-portable/pull/339
-
-From a15d08a25f1ccc3ee803dfe790cc1f608651464c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 8 Sep 2022 02:49:29 +0100
-Subject: [PATCH] openbsd-compat/bsd-asprintf: add <stdio.h> include for
- vsnprintf
-
-Fixes the following build failure with Clang 15 on musl:
-```
-bsd-asprintf.c:51:8: error: call to undeclared library function 'vsnprintf' with type 'int (char *, unsigned long, const char *, struct __va_list_tag *)'; ISO C99 and laterclang -O2 -pipe -fdiagnostics-color=always -frecord-gcc-switches -pipe -Wunknown-warning-option -Qunused-arguments -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wsizeof-pointer-memaccess -Wno-pointer-sign -Wno-unused-result -Wmisleading-indentation -Wbitwise-instead-of-logical -fno-strict-aliasing -mretpoline  -ftrapv -fzero-call-used-regs=all -fno-builtin-memset -fstack-protector-strong -fPIE   -I. -I.  -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -DSSHDIR=\"/etc/ssh\" -D_PATH_SSH_PROGRAM=\"/usr/bin/ssh\" -D_PATH_SSH_ASKPASS_DEFAULT=\"/usr/lib/misc/ssh-askpass\" -D_PATH_SFTP_SERVER=\"/usr/lib/misc/sftp-server\" -D_PATH_SSH_KEY_SIGN=\"/usr/lib/misc/ssh-keysign\" -D_PATH_SSH_PKCS11_HELPER=\"/usr/lib/misc/ssh-pkcs11-helper\" -D_PATH_SSH_SK_HELPER=\"/usr/lib/misc/ssh-sk-helper\" -D_PATH_SSH_PIDDIR=\"/run\" -D_PATH_PRIVSEP_CHROOT_DIR=\"/var/empty\" -DHAVE_CONFIG_H -c cipher-aes.c -o cipher-aes.o
- do not support
-      implicit function declarations [-Wimplicit-function-declaration]
-        ret = vsnprintf(string, INIT_SZ, fmt, ap2);
-              ^
-bsd-asprintf.c:51:8: note: include the header <stdio.h> or explicitly provide a declaration for 'vsnprintf'
-1 error generated.
-```
-
-See also: https://lists.mindrot.org/pipermail/openssh-unix-dev/2019-June/037811.html
-See also: 73eb6cef41daba0359c1888e4756108d41b4e819
---- a/openbsd-compat/bsd-asprintf.c
-+++ b/openbsd-compat/bsd-asprintf.c
-@@ -32,6 +32,7 @@
- 
- #include <errno.h>
- #include <stdarg.h>
-+#include <stdio.h>
- #include <stdlib.h>
- 
- #define INIT_SZ	128
-
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index b35bae7d7133..81767487cf2b 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 87a283f4575e..c37c52694f79 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,4 +1,7 @@
 AUX tin-2.6.1-configure-clang16.patch 2473 BLAKE2B af55c171def1e2756bdb305069aeb81b79198397afb38738c4298a1268dc813f7a9c11b941da503d11d5b2d4bac48cb5fa987486dc42a833b1d8241e05779542 SHA512 56ff3b3e71f79145feeaa6e6ce20bf2ebdc3f4b02681423dcabf27ccaa69ffeecb85430b2aed6c07bb9c90fffcaba35801dd44f4e8a81d0fd6fd698cea010af1
+AUX tin-2.6.2-gnutls.patch 653 BLAKE2B fd5ad80b1f2e5c5307e28e513f2aaf9cbd17f12517aed07298aaa54dc85a26aa28f4a091841fd2efa154b9acc4fa7749d575ec3aba60e4008f9c1ef533a50120 SHA512 d372ce615a18ab5cc67ec69e71870e5073937e8a59f55cf7e5a43271cd9eb55ae379e875b8656b2140403e23792df1844b05ff234cbed18883f59a445d11d21f
 DIST tin-2.6.1.tar.xz 1570500 BLAKE2B ec9c54b8b89ecd33a42ede37c8db50828de2dce56ddff01900121903a18d73bde8a06733ca2dfb72c676eb373b5ea874cecb9a1ee7890ada4ad6539d9ff1a435 SHA512 dc9ace5e24cac1efcaac25df1747dd435573130cff4e9c846c89e8faaed8e8120d66a2021332c01f350744155bcb7be608657285560a1a2457b4635cc8fa22b3
+DIST tin-2.6.2.tar.xz 1598732 BLAKE2B 0e5bac9a711fb69e64d64b4f0c070d456f38f727e7b7aa794ad5ada8695c2174023964b8f07d2e7d6add51cf0c7c3102965bef653a7e873275747145cb70dbe2 SHA512 4c9e0edb3268d57fb89d9d53a90e8a5ba73da7c1da63c834224bed0f763502a7c3dd325351d3e57b1ddcb57494a84228cc38f227c49300b759fad8d112b1cac1
 EBUILD tin-2.6.1-r1.ebuild 2025 BLAKE2B 11841532f22a5b6c56c0e5261d24c501ec46f76edc062155d2385e63cc2052e369bae4c3d697e4c0811a63d84b693a112b5ce038e40520398a741c388421a388 SHA512 5cf5e4b1249df5eed6f124499aa3cb56623a5ec2b00e971fff58f4c44fcf91c737718618c56df5eef5923cf552c3fc8f5330af21792698aa526be9f1a2623fde
-MISC metadata.xml 408 BLAKE2B a89a2128685a8dc089ba37438352ae8c7171b74c90a8f838a5b7d930b142a90e6d69672ec4ec3f4e97e71c6b38ef9daf988bd5b46d6ccc9f3e4aa0f173075679 SHA512 26855098ca6c2da9fa4edf5620be29402f3c854280e3ca1b26a43af9d630ca34d229a34cc7b513c20c0a03c9e500830fc586f0086668042cff645d08741306b3
+EBUILD tin-2.6.2.ebuild 2616 BLAKE2B 1a413554c21c265ff5788cbc803a8d93c1dbabfd5bb80bcce80b8bff9225c63a5382c8a47ec6793065af57ae3de2dafb0520325a6e47c6acce00ef999dd906b9 SHA512 7200bc8e81eaa2414274db129b0d873601d92dd5c476462f5e61efe508660ace7a1b1f0b824119733d2d43a4578902825f61d19cdab50cd58b8151015fcd3d18
+MISC metadata.xml 702 BLAKE2B e49603687a5cf71915d5228e4ecb37b2d14adaebdc7e77d6ccde3fead607e40a722e72423712d38194e14af5e4e429598c1bd7e52242688c6f746a983bc4d7f2 SHA512 cb7e2a8b53bdbb06270daf300fac3af347bdfa40049966e75b7e18db4157569dafc50a1c5abb3367a0103718c26e703b3245b5076686df81ec9727338ce42491
diff --git a/net-nntp/tin/files/tin-2.6.2-gnutls.patch b/net-nntp/tin/files/tin-2.6.2-gnutls.patch
new file mode 100644
index 000000000000..b7f7de0956a2
--- /dev/null
+++ b/net-nntp/tin/files/tin-2.6.2-gnutls.patch
@@ -0,0 +1,36 @@
+Upstream patch to allow GnuTLS support without debug definitions.
+
+--- a/src/nntps.c
++++ b/src/nntps.c
+@@ -41,8 +41,8 @@
+ #endif /* USE_LIBTLS */
+
+ #ifdef USE_GNUTLS
+-#	ifdef DEBUG
+ static int verification_func(gnutls_session_t session);
++#	ifdef DEBUG
+ static void log_func(int level, const char *msg);
+ #	endif /* DEBUG */
+ #else
+@@ -933,8 +933,7 @@
+ #endif /* USE_OPENSSL */
+
+
+-#ifdef DEBUG
+-#	ifdef USE_GNUTLS
++#ifdef USE_GNUTLS
+ static int
+ verification_func(
+ 	gnutls_session_t session)
+@@ -953,8 +952,11 @@
+
+ 	return gnutls_verification_status;
+ }
++#endif /* USE_GNUTLS */
+
+
++#ifdef DEBUG
++#	ifdef USE_GNUTLS
+ static void
+ log_func(
+ 	int level,
diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml
index e9e3c1ae47e8..2273dcd0ef5a 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<upstream>
-<doc>http://www.tin.org/bin/man.cgi?section=1&amp;topic=tin</doc>
-</upstream>
-<use>
-<flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
-<flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
-</use>
+	<!-- maintainer-needed -->
+	<upstream>
+		<doc>http://www.tin.org/bin/man.cgi?section=1&amp;topic=tin</doc>
+	</upstream>
+	<use>
+		<flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
+		<flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
+		<flag name="libtls" restrict="&gt;=net-nntp/tin-2.6.2">Prefer <pkg>dev-libs/libretls</pkg> as SSL/TLS provider (ineffective with USE=-ssl)</flag>
+		<flag name="pcre2" restrict="&gt;=net-nntp/tin-2.6.2">Use <pkg>dev-libs/libpcre2</pkg> instead of <pkg>dev-libs/libpcre</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/net-nntp/tin/tin-2.6.2.ebuild b/net-nntp/tin/tin-2.6.2.ebuild
new file mode 100644
index 000000000000..50345f36be9e
--- /dev/null
+++ b/net-nntp/tin/tin-2.6.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="A threaded NNTP and spool based UseNet newsreader"
+HOMEPAGE="http://www.tin.org/"
+SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cancel-locks debug gnutls gpg libtls nls +pcre2 sasl socks5 ssl"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/uulib
+	sys-libs/ncurses:=
+	virtual/libiconv
+	cancel-locks? ( >=net-libs/canlock-3.0:= )
+	gpg? ( app-crypt/gnupg )
+	nls? ( virtual/libintl )
+	pcre2? ( dev-libs/libpcre2:= )
+	!pcre2? ( dev-libs/libpcre:3 )
+	sasl? ( virtual/gsasl )
+	socks5? ( net-proxy/dante )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			libtls? ( dev-libs/libretls:= )
+			!libtls? ( dev-libs/openssl:= )
+		)
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/yacc
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-gnutls.patch )
+
+DOCS=(
+	README{,.MAC,.WIN}
+	doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,filtering}
+)
+
+src_configure() {
+	tc-export AR CC RANLIB
+	tc-export_build_env
+
+	local myeconfargs=(
+		$(use_enable cancel-locks)
+		$(use_with cancel-locks canlock)
+
+		$(use_with pcre2 pcre2-config)
+		$(use_with !pcre2 pcre "${ESYSROOT}"/usr)
+
+		$(use_enable debug)
+		$(use_enable gpg pgp-gpg)
+		$(use_enable nls)
+		$(use_with socks5 socks)
+		--disable-mime-strict-charset
+		--enable-nntp
+		--enable-prototypes
+		--with-coffee # easter egg :)
+		--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}"
+		--with-screen=ncursesw
+	)
+
+	if use ssl; then
+		if use gnutls; then
+			myeconfargs+=( --with-nntps=gnutls )
+		elif use libtls; then
+			myeconfargs+=( --with-nntps=libtls )
+		else
+			myeconfargs+=( --with-nntps=openssl )
+		fi
+	fi
+
+	myeconfargs+=(
+		# set default paths for utilities
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-gpg="${EPREFIX}"/usr/bin/gpg
+		--with-ispell="${EPREFIX}"/usr/bin/aspell
+		--with-mailer="${EPREFIX}"/bin/mail
+		--with-sum="${EPREFIX}"/usr/bin/sum
+
+		# set default paths for directories
+		--with-libdir="${EPREFIX}"/var/lib/news
+		--with-spooldir="${EPREFIX}"/var/spool/news
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# To build from the root dir you have to call `make build`, not just `make`.
+	emake build
+}
+
+src_install() {
+	default
+
+	emake DESTDIR="${D}" install_sysdefs
+	emake -C src DESTDIR="${D}" install_nls_man
+
+	dodoc doc/{*.sample,*.txt}
+}
+
+pkg_postinst() {
+	optfeature "spell checker support" app-text/aspell
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index c72da0798ece..6e9fe70aa3e5 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index 534ff4547526..88f09741c8fa 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,6 +1,4 @@
-DIST ncdc-1.22.1.tar.gz 371572 BLAKE2B 22125062a42f77e8a7a8afc699523b27a2b7ec566891676ca13b415e93cdae8e2d8d38f303070c7f098408f537266404a875b9ed7f9931a39933916a0ba576ab SHA512 b084ee28a799705009600c450016719ebb992cb0bf7e026513f4cd7e93b2566e7bf8e352eec92f3d69612ce06c930587759d7f7d20d14ee9fe1d5c4b8c4393af
 DIST ncdc-1.23.1.tar.gz 378481 BLAKE2B 0eb59b88351008c281e7380fb5899b0cfb5f99dac5f17eed391a7da4f95a431a0a68a70c228dec17c235029bae89f8170319f9b28c5a2dc04706ea21b8c91879 SHA512 9e38387ac816499c25a28bf70e548d560265c84d12b9bfd1701decea642c4ab33b3bb5ea9c015c3048e491f9f208c6c26a63d2ce722e831f84f703a6c9f2b86c
 DIST ncdc-1.23.1.tar.gz.asc 833 BLAKE2B ce9f4bd4a612fe862ab34e659e41c2134f31394e285af9d0e3f9ec034f44ccaead2c56db3b9cbb4eee32dab61c86ddb308cbb18023ce1aaf11af9b2ec6d4c67b SHA512 28270437bd08fbcc40a645eef8d71f2ab350314507b66fbd504c7ccab4899af51f483038cefa17d879213a419465ae27a4da8a3fe0598244357f2836a6a5d771
-EBUILD ncdc-1.22.1-r1.ebuild 1008 BLAKE2B 47fe280bffae834f472d5eb3e7a9252f38f825a2d93a74e25f29a696ac866e1b0bc0eae4527b249a0bc3b1f7e362219ac2a9928b29a67b9d0ec6b8a96f2b7025 SHA512 a13ed9cf3277caa79278fc6ca7850f342f329b7a44d962ff9cca4df78dd754bbb57375d5ed3c07777995bda5e432c302dd4e38c909a91861c01855c89a9e0ad7
 EBUILD ncdc-1.23.1.ebuild 984 BLAKE2B 13a3f61ba0637a04eb9ecdd9e8d015ac5ab0e02022c0325527b8cb897e89aa9cd569757646f413ef6118e71c1f6ddbe129a1c710595742bf437fed61b415c5e4 SHA512 7d214ffe1bc905989e55147363cc24adfd41bdb6be1cd6cae54263c942fd9a28e270cd1d7d438b0d32b30ca4e8cfee705cc9e5abfe75216fb8d2a1bee5f6cf55
 MISC metadata.xml 722 BLAKE2B 068aab8419d1acc00c6667aabd2e46179d181718914940356246cb216e098237d0752ebc0b21d88111be6a291079046c921980d0d5e7ecda89d1739fe4a1f2b2 SHA512 91d3e26de3e3e4cff35dc79577488617341db89764ef1cf2b2a7121dc9e3d32571bb89f140edc4cc67cf6e44ef1175776f3ca0b404c8af7e898890bd672be67b
diff --git a/net-p2p/ncdc/ncdc-1.22.1-r1.ebuild b/net-p2p/ncdc/ncdc-1.22.1-r1.ebuild
deleted file mode 100644
index de52efefa50f..000000000000
--- a/net-p2p/ncdc/ncdc-1.22.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="ncurses directconnect client"
-HOMEPAGE="https://dev.yorhel.nl/ncdc"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
-else
-	SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc ~sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="geoip"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	net-libs/gnutls:=
-	sys-libs/ncurses:=[unicode(+)]
-	sys-libs/zlib:=
-	geoip? (
-		dev-libs/geoip
-		dev-libs/libmaxminddb
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/makeheaders
-	virtual/pkgconfig
-	dev-lang/perl
-"
-
-src_prepare() {
-	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with geoip)
-	)
-	if [[ "${PV}" == *9999 ]] ; then
-		myeconfargs+=( --enable-git-version )
-	fi
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 28cd5fd53f72..8dfd7753d586 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 8940d3184d7f..726d7ef2c21c 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -15,4 +15,4 @@ EBUILD squid-4.15-r3.ebuild 8017 BLAKE2B 0fd277b4ae06a10d440f27775eadc0f1e856a78
 EBUILD squid-4.17-r1.ebuild 8183 BLAKE2B ca1794b42ea7605d0fc0dae80a5d6071fc7929528d1619848fccd1a05c600057695596026d96efa21a3076b543ac8df20fecbba054a41182cdf317ca2059317b SHA512 7a94968e331c85dd6028d9c958c016c214d936176fae3c2453e8caab31df24bc2b3fa558934b2dc88ceec157af63323fb3ab7e10f893984414f49674fe5b1f6e
 EBUILD squid-5.4.1-r2.ebuild 8250 BLAKE2B 22e77f2b4d875530774a8d73c5fdf71cf0ad7a003c02da559fd52d77aece0e02d120fc4e963791d0baf27764c26d21d631c4f5da8ae30ef97cb1a6fa9d9f983c SHA512 723a783fa59ff8531a661d43669ed49f5013b0b7729f74bd65a831b1c4ba718fd2b6b95f199827ee3c37661de7ff5fc8d3bf330ae6e75179d3c647ec81328fb0
 EBUILD squid-5.7.ebuild 8976 BLAKE2B 036facf09ada31bfcca73131f47646ac07f6b8aee73e4baf3460592a4e2067def5c802d7ef0ba4b68e3d6f6df28b78c235e0ebae0757196e28cf12a012583e23 SHA512 ffc64b6fc1056ab5c906bb1398a07ecb77f620f452c9e1de40553a52544be3d6f7233d5b612c67d09608127a91deb0560037a436e16e862f7cdbc87b97b13f8d
-MISC metadata.xml 1122 BLAKE2B df43077e3113d801e26cc7841957ecca3501e0fe64df103cecf778f3385ce7f0fb9921c0c480613d709bd43f2b150d02068f432934e24c9428a410714cb5db49 SHA512 f1f3259e3d0d438e3051b020b84d6b14e4ca93c92519150c5f97477de26916810754f579a60bda4c549d8d415d41c3856322ce76ade5b3e7dd36918fc37595f3
+MISC metadata.xml 1351 BLAKE2B 8a6ea8bc939b5900572bd323fb3be78e0dfa9b4d7436f2d5e27fa59905f57af5cd9b7fe9a2903f8f57859a88176aab17c1a5d507a69765aab0f5320ceec69c96 SHA512 db7a47668d220a16f10d25319ffc4cd33270209d7d00f488d45680150f094d70776c4bf3c7b203b6ec8c69be18e5ac3a78d3d4367ec90a9ffb91ffd29f66890f
diff --git a/net-proxy/squid/metadata.xml b/net-proxy/squid/metadata.xml
index 2ba4a5336151..8a427f9e8ce6 100644
--- a/net-proxy/squid/metadata.xml
+++ b/net-proxy/squid/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>hlein@korelogic.com</email>
+		<name>Hank Leininger</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="ecap">Adds support for loadable content adaptation modules (http://www.e-cap.org)</flag>
 		<flag name="esi">Enable ESI for accelerators, will cause squid reverse proxies to be capable of the Edge Acceleration Specification (www.esi.org)</flag>
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 4085c1bfc276..b614af3c7edd 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 793bf8edff8c..e0ddea0a12f1 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -9,6 +9,6 @@ AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a591
 DIST bluez-5.65.tar.xz 2208100 BLAKE2B 9d2937e2e14d8d8945183c6436921d9d16a6d3bcb5dbe3e2493554fbc4972bb4c006aabc793c9fb8eae47a7e9f29ae9fdf47551dfc0a238e86f5a76ce7436ae2 SHA512 c20c09a1a75053c77d73b3ce15ac7fd321eb6df5ca1646d57c6848b87c0c9957908bc17dd928da4ef2aacfc8667877cbc7511c1ba43db839bfa9bf1fb8269907
 DIST bluez-5.66.tar.xz 2257288 BLAKE2B af1911cf590461a874daa16bedb8a021a3b2c2af3254360c035d2180e0f355372651bd41da342c26e6d9631d726dd08e0d6a83a22069333b94b6fce6d546718c SHA512 ed0994932687eacf27207867366671b323671f5d5199daf36ea5eff8f254f2bc99ef989ef7df9883b35c06f2af60452be8bad0a06109428a4717cf2b247b4865
 DIST power-state-adapter-property.patch 22488 BLAKE2B a46173c0ebe4f4822c67c2f8f2f3e67dab261753f64204f1a61665c3bba1d7a10e0f8511b38ce273d986490ffd262a737bee82694909683df7386b2015301607 SHA512 b039a578454681f291dc3b04079c8d0151b13a84b4b013e290aa3c28aba1538cef2d9e9aadfe88a0dbfb8e4cea1c251cb5043f4175fb32d53526f7b82de0451a
-EBUILD bluez-5.65.ebuild 9527 BLAKE2B d0556524daa2ecd99d3ca83be9711042b6b0dfb41e024cd4b9db52e5a17722857150486442c50a1788e7a24cdd3c4dd64defd2445f326233353bf5f3a7e3340f SHA512 e8ffbb3796c727b4ad40516fc05cf929d985d2bf0356df32b41caf9ab210aab701cd4e3fd9a4a01b9fbcfab355a703609f1acc34dac321ede2d3163389c65bbf
-EBUILD bluez-5.66.ebuild 9615 BLAKE2B e5b6f2ecca2feac33906254305c689686e0151584fc641224d35d621a5e8dc6a6d511cf71c1f37c8eb5b02f47b5d4bc5a05701af11a2cda0afcde5344d2ab833 SHA512 5efb94d99bc18ecd76e0be89723aa985620d6bcdae78f3713451c13461d7eaa4f58786c87b9db26e3c8610d7e21d5a6f5fba55c5867553ef02f4600322237504
+EBUILD bluez-5.65-r1.ebuild 9572 BLAKE2B 55f5f2c1513f1fd9740a6f953366ed39ea80fb3b8168401e0e4151b78425854cedc9b970493a1fa8622aeb429dbf40a9f6affbdc7743d36ffd0f5f49a5f1cfe2 SHA512 ec011321816418eeaa4bd43838ca8520aefdff4416ee0a7ac6baafe0c0cdacf1ec1f0bef7c8d026f03abbfa929f90f7ea2755997037d2519c6ce94329da7eada
+EBUILD bluez-5.66-r1.ebuild 9660 BLAKE2B f97a043ea92784dc8c77efb205bde19c41c84679ef6fe74c6f8615d6ac2b96f7f59596469c66acce68768abad6e6a897b45f1fb1e09cf1e9f4469f57cf63b895 SHA512 049880032a446769967a962d57dc077b087000cd315ccd891afe48ac52d1b0ba4d20c9c9386820f918b2f33a5678d1e4cac8391bcf1f4af11a590776bcb0b8e4
 MISC metadata.xml 1099 BLAKE2B 75b6db1d43b75f9b22ce5fb6ec640e2e06b2f2575ff75441318a2076b8486ed7d81a62714540c61ab3a35198113538546b9aa71d05ef4cd7106c8a7f09c13029 SHA512 6e4a7bba7102b4850a938ba0f6feec9cd12488d4b440b19982751c2a742b33a565933fae3967080c060e5b5eb51d90268abc87a2c0a2efb7f4c773020c29462a
diff --git a/net-wireless/bluez/bluez-5.65.ebuild b/net-wireless/bluez/bluez-5.65-r1.ebuild
index c377f834337b..688d93d9f93f 100644
--- a/net-wireless/bluez/bluez-5.65.ebuild
+++ b/net-wireless/bluez/bluez-5.65-r1.ebuild
@@ -55,6 +55,7 @@ DEPEND="
 	udev? ( >=virtual/udev-172 )
 "
 RDEPEND="${DEPEND}
+	deprecated? ( !net-wireless/bluez-hcidump )
 	selinux? ( sec-policy/selinux-bluetooth )
 	test-programs? ( ${TEST_DEPS} )
 "
diff --git a/net-wireless/bluez/bluez-5.66.ebuild b/net-wireless/bluez/bluez-5.66-r1.ebuild
index 443e73048f0d..4278549b3ee0 100644
--- a/net-wireless/bluez/bluez-5.66.ebuild
+++ b/net-wireless/bluez/bluez-5.66-r1.ebuild
@@ -54,6 +54,7 @@ DEPEND="
 	udev? ( >=virtual/udev-172 )
 "
 RDEPEND="${DEPEND}
+	deprecated? ( !net-wireless/bluez-hcidump )
 	selinux? ( sec-policy/selinux-bluetooth )
 	test-programs? ( ${TEST_DEPS} )
 "
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a981544e6746..f7df9b339ca1 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0b7dd34a27a1..506344e98969 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6638,6 +6638,8 @@ net-nntp/slrn:canlock - Add support for cancel locks via net-libs/canlock
 net-nntp/slrn:uudeview - Add support for yEnc coding and more using dev-libs/uulib
 net-nntp/tin:cancel-locks - Enable Cancel-Lock header functionality
 net-nntp/tin:gpg - Enable app-crypt/gnupg support
+net-nntp/tin:libtls - Prefer dev-libs/libretls as SSL/TLS provider (ineffective with USE=-ssl)
+net-nntp/tin:pcre2 - Use dev-libs/libpcre2 instead of dev-libs/libpcre
 net-p2p/airdcpp-webclient:nat-pmp - Enable support for the NAT-PMP protocol
 net-p2p/airdcpp-webclient:tbb - Enable support of the TBB library to improve performance
 net-p2p/airdcpp-webclient:webui - Enable the Web UI
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 7654e82bfb6b..6d390afeffb8 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/passwdqc/Manifest b/sys-auth/passwdqc/Manifest
index b134b0d150b2..b16072ac7636 100644
--- a/sys-auth/passwdqc/Manifest
+++ b/sys-auth/passwdqc/Manifest
@@ -1,5 +1,5 @@
 DIST passwdqc-1.4.0.tar.gz 55219 BLAKE2B 3f96a2d219ee23f11db2ad8ba433eaa56b97a263ad1a49159e0356b779cb4486ec9aa74cd7002fdd6d273e5a7bae4fe1b94e02f60256d331e5afc30d63e81360 SHA512 b9be6632688a1d7d929ec546679a366a67d44e7841e106c7f739a8e0656842866125160c87b04c8e0b3189a3e85eb182aa789196f68925b2f8ec71cd6a479800
 DIST passwdqc-2.0.2.tar.gz 88796 BLAKE2B 4be0180dbee38d124cc5fd3780fcc27b276bd9370c59c83a9c037b67f18518873bd34d23f779125ac0b5e8bb1f40a5e8e24dc65bfe5919f735f96d4f625cebdb SHA512 60f91ad7c86314b0d9ad97a2474a1a5bbb8b41491b274e09f7300d8a609cfffb0688bf39d4e715f647f3c87bfee429cb5e01f1a641a14eea3f55b223610ed8ec
-EBUILD passwdqc-1.4.0-r2.ebuild 1284 BLAKE2B a07c9d3faa8df29ac31fca0b43774fb5beca507d9ea5b5b7af64fd439acd7ec5ff83ae426e49603da061856993ebba0776f034332b830c0fbf478bf9427745ff SHA512 b80acc44dc913fc7f4ce3c7bd9a93a4764a7c5a35cfa79d35fdc0a43ba62e37e73888fa9350726f5d3d38ee77e677296d09b09aa02585f7821e60ffa6c05c892
-EBUILD passwdqc-2.0.2-r1.ebuild 1300 BLAKE2B 9cef09877fe95e5957750f752ed7396b6956b35af1dd5fcc3ccb9de6ca2525ca50bf732378fa141aae6276f3545386906389fff1ee1443e2d6230d92ee515707 SHA512 bf4f398239e0a2f63c02c1f35bb1453652dc75a8bec89989c80f2dacbe9b95e0ab83ec5e3afb386b53fd81f15f1a5daf04e1f392ec25d20d03e5c566c181f02d
+EBUILD passwdqc-1.4.0-r2.ebuild 1588 BLAKE2B a7ded9db95d63e238d5293d609819a57855dbe26449dc28917f211bbca97cf8a93008cbf4178464a45eea28e8615b0745cde90aeaec4514ca4bd7fc2a1633368 SHA512 f7eaba8bd7ace225b0f70d79f27505e595519f554f070d3b3d8d4f583934bb50d2f924e64c769b4ed9d7311c67178db2f8b36e31dd9890ef4c3788d5a3ff3dbf
+EBUILD passwdqc-2.0.2-r1.ebuild 1604 BLAKE2B 9da4fe1ffb08e174a1e803885b71c213f877956bf40855957889dc4e8d7a53ac260ee7f434a0a5b537fe4eb715cf0fe961f944a68d1b3b29209286f625888cde SHA512 a2364fc7b56cea12f905ca149422cd21b64efb1f4ca04329a8d097570b730537a1e52893b5ebb18564fc28d02308a3227cf5dbecf7d2129d77193cb4eb69ea6f
 MISC metadata.xml 406 BLAKE2B c9c09f5769ef2219d38955deaf449ddc90e2a108faffc48f14cf49ea47a9844cb6808815e39a02116d943e3776d1b9d6323d8fe5217172d18606160c5cf43031 SHA512 8afab23cd4966626ca03b43412f35aa65c213487850ad2897df9932779eba8d489bddc2dd15c0eaedcb34294d9621a0c0e2b85c4a412b7816a06d18167d7aa18
diff --git a/sys-auth/passwdqc/passwdqc-1.4.0-r2.ebuild b/sys-auth/passwdqc/passwdqc-1.4.0-r2.ebuild
index abb50e927b18..90ea5b5ec52c 100644
--- a/sys-auth/passwdqc/passwdqc-1.4.0-r2.ebuild
+++ b/sys-auth/passwdqc/passwdqc-1.4.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit pam toolchain-funcs
+inherit flag-o-matic pam toolchain-funcs
 
 DESCRIPTION="Password strength checking library (and PAM module)"
 HOMEPAGE="http://www.openwall.com/passwdqc/"
@@ -40,6 +40,17 @@ src_prepare() {
 
 }
 
+src_configure() {
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
+	default
+}
+
 _emake() {
 	emake \
 		SHARED_LIBDIR="/usr/$(get_libdir)" \
diff --git a/sys-auth/passwdqc/passwdqc-2.0.2-r1.ebuild b/sys-auth/passwdqc/passwdqc-2.0.2-r1.ebuild
index a81c6b2a6942..2710ce4c24dc 100644
--- a/sys-auth/passwdqc/passwdqc-2.0.2-r1.ebuild
+++ b/sys-auth/passwdqc/passwdqc-2.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit pam toolchain-funcs
+inherit flag-o-matic pam toolchain-funcs
 
 DESCRIPTION="Password strength checking library (and PAM module)"
 HOMEPAGE="http://www.openwall.com/passwdqc/"
@@ -40,6 +40,17 @@ src_prepare() {
 
 }
 
+src_configure() {
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
+	default
+}
+
 _emake() {
 	emake \
 		SHARED_LIBDIR="/usr/$(get_libdir)" \
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index af7288157979..3ee594a07b7d 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 868e06c2b643..7792283121d0 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -22,14 +22,14 @@ DIST binutils-2.39-patches-5.tar.xz 82924 BLAKE2B 2cf75f661989f22270d6afe5f3c543
 DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3
 DIST binutils-2.40-patches-1.tar.xz 12260 BLAKE2B d525502e08012080417634fd41981550362d4d799952e89f388af2a6e5db5b80e88bfdb0b5b1d2a1bcf8ebda529eefbced8fa2ae84c7fe3ddb10184e98d4b369 SHA512 140f80be786511f63651e67bf25c2992de6a21bac00a3252dcf98becc3f9379c8070ef1380d5542bbf2e1908c50dab2c7ebb651d13bb97609594fe9fd9f1f079
 DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925
-EBUILD binutils-2.32-r2.ebuild 11947 BLAKE2B 5fcf062f7f17807743e0a722d2b5d84a051cdf72325c6e1c6eca498518e57dd17e6fd7ee76f858b8cee742784e5e5b5682849d7df370595c6626bab2e27f5ac1 SHA512 743d9a8e11e08d22104d7a4e3fe829c0646560ff7e454f00566ff0dcd10d65a2853116a1aaab2ab041fa205d471bfe5fb39dd646d9e046224c7cac0b7e7d335f
-EBUILD binutils-2.33.1-r1.ebuild 11683 BLAKE2B 19ecdb0ed4bba9619e034ff44c615c5deed13e719dc89657b4a0f19acf101c04e63bd9b40d8c19319455e8886c781c8eec08197d338b75f83b5e827257afe01b SHA512 f7a69f3ee714da6dd61b399940a23aa7d2f305eaa9af430e883859757edea4d08790f907de16f607f800044647e864ce8c7662c082fc41e7be007c244d876718
-EBUILD binutils-2.34-r2.ebuild 11779 BLAKE2B a75e8d78049c5946a9b3fead9c57b0549869fd1ec6f3962ea82431bd1ebf0021b6545c7fbb9abb95d5854936deb79e1426c336c9ffbf6f934b481c912c0c5ea5 SHA512 19023e3b7d8036c732125848ebaeb6ccef827e50bcf55e83f314ce0f5028cd7b6ffc56befe92c6474c9b09b0c442763a2e901e58a56957466587637580447ca4
-EBUILD binutils-2.35.2.ebuild 12660 BLAKE2B fa9a02b7f8671ae143fd7b7c57455c14c8fbc852f94a3827d478dfff26a642976ff305a713b1f06b2574b836773b5cc4bbb79ed06504eb84aa638cf211d77b21 SHA512 2d207f5435b7c76be1e91b5c9fd2aad390817c40bd2a66f99470c4e74c5cb1216798124ee374a2c9f0e43036e527922c0a1e8bace4c91c35e7461386c8b1cc91
-EBUILD binutils-2.36.1-r2.ebuild 12562 BLAKE2B a4b167d673eba6363b4b8588b2bf0708fc6658a53442027a61f7f16f22cb7e7239279f531ba13b50fe434841ad51f4ff24f962679d513391c6dbac47d65b6c8e SHA512 001fb6d62e387bcbd19380f3e2b70bf165be9a018d3377c1f697c48bf8323a49d0d65502e98ebb3536f9436259a91f04a7b154870dea1e9f41eeef030c845261
-EBUILD binutils-2.37_p1-r2.ebuild 13033 BLAKE2B 03ea9dff3a46146cd7cbdc717301b0f522d175d196f6d7552bd432be9c6f58ea776b5434e81b4997fa3cc770899258eae750b68eaa9e2238aa5d5f3873ba853e SHA512 de72d5f4b635f78995ae8fe8cc6e99eab9c5755b79f96e462a66f6b1fe8a886ea1cc818a9dcb431e516f8e80d0c3d36b29719805f0bea7e81fc30d4c7a3b3c13
-EBUILD binutils-2.38-r2.ebuild 13411 BLAKE2B e232741b2c698961615d2ea9b0590f7a2ffd9a93981cd913c3789185989f0f96107af2448c9452f46e8b2e445d8cc5e2f8e8649ecce2187c0c78f8251dd0b653 SHA512 464409d4225d308bfba9d549ac7a4a177684f4022a6a65479fb1e028e14cc5030784bda394f7f99568efadcf1c8c372cc1d2246d42ccd020ea5a6226d0fbcfbf
-EBUILD binutils-2.39-r4.ebuild 13937 BLAKE2B 77ad82e27bebe116112ea2a0198c4b0a1e4fa981a746fcb9fa4c84889119b6798455b1071a9963f8ff43d2a12ae894b7cf970ac551dcbd4f2916f4422968827c SHA512 29bad23ae51c8990c3b2c12e6f5e6198ab5807267a8b8ac45f85101dd4e251ed90717ecbb9d28c784aa4a85fc9dda0eb2dac975b84965f3f3a5652c2d65d264c
+EBUILD binutils-2.32-r2.ebuild 12208 BLAKE2B 0ee98e7c366617db619f650327c4c645c31102ed5232262655e03e396a624741d265129721472e42b0aadaa45383bb357fba08ecd09fa1f8c1e2c14909a64383 SHA512 d8c265716f7fd6ae9bc1bdf4571bb626681ac7073b094cca020f1d795a644943eac244efdec6299c7ab6b26624d10f041dddeb1fc879953f4427c03f5d7e18ac
+EBUILD binutils-2.33.1-r1.ebuild 11944 BLAKE2B bf02f123bd6913fae0666963c373f2167f65fcd495a2d0166f8fd65ba2d7d6679e7ccdb3328760c1ab1d548f1faed0c5356461a2439c1891a70e15464bdf31f4 SHA512 58a9ff178b76437af93ac7e62a7a928311f5ea497f11bfd4a56e0ca19e96880205160f4f3fee4bd020cb029fabb52530dc0e858258c3a1bbc997785af4e06077
+EBUILD binutils-2.34-r2.ebuild 12040 BLAKE2B 93ed9f08caa1f061b93f9922d986484b5e5533ce12c36ab89cf5355552bad75549454b615a438c840e180a87b190a5ac06508dcb2b143ce8deca159b4acf432e SHA512 c8fc2c0be68c7299fd91588ef0cdb308e01ae88558949e7c6327bfa0ae8d672c9c443c5aa94742adb090c63e321e3c10edb6478d4b589dfa01425581a2ff80fa
+EBUILD binutils-2.35.2.ebuild 12921 BLAKE2B 8eac1629907fb59998bc9d9e92b28f493df47d2880b37a78e5b94248d33c79d168419e1fe81a3c58bf4612e6f61e7c40a33e61e0ac73b5deed93b8c8c7ca1388 SHA512 fb2faeed8a5712a23329c6a86587c9fe52feb0f3a5198ab3a09ed16c368ebb26b1447f8fcdb4878bc5fdb75d75cc6d7c7d2f1459b44b77835a7bb9c2be36d4ad
+EBUILD binutils-2.36.1-r2.ebuild 12823 BLAKE2B 850624989343ed5c904a595e274576703da2ed0b0db0ce3620ec8dc542c29a363d799feed6fcb8dce7570511785905e3fc99c9f12fa4a310ceafa8016d2f4eea SHA512 351595cb4ba4faeae5a797c9ead374448ab1a85cd625591afc1ef1681a68169a94974ffd06ddaa3ff671d07d063855f61ddcfbbfe307d37e5ddb0ecb82c24cf0
+EBUILD binutils-2.37_p1-r2.ebuild 13294 BLAKE2B ec26ea427eb05e6368b046b05eb45ee1818f76e37ccbfccb5b2c47654af7cc2de9a4583a1d1cac19b228d06ea8819a61a1889578159d3624f0a2a53fc63d632d SHA512 81f23fd8da3b6173bab2ccaaf21da02a7c52c3923ada533794fccea35747b25bd5cc0a47a21b72b2610227ef36a9ce9674fd8ae53a4c6af626fb3464ea783f7a
+EBUILD binutils-2.38-r2.ebuild 13672 BLAKE2B 84e1567892739e624554005600f8dbe123bcd524728bd1c06797fdfae2c91f39ddff5b6aac420c9571508f6f88b79a567c9144e5670f48c8fa4b7822e5ca5b02 SHA512 e7b6822f6482c3bbbab21292d19a267a711541e8757c7d1ea0c8b09cdfc71ba3beee98e53a56ab7d0789122bebca801e45d13d255b0051647dc1f89fa7a17680
+EBUILD binutils-2.39-r4.ebuild 14198 BLAKE2B cbf86f3a11d9d2ea415feb730fb755f681306bcd18113517b5e3d89171b4ae494cfa10487025aa36800465d83c52f2c618aab611aecf512f9c70f17b85e4ba7f SHA512 a196dde125398f81bde1d635c97f17cc067324f19a428c6c582e47f803d36255bee0558054111f7dcbd253e00a6f107e7d1fc402d8b6a9f5cd29e932cada712e
 EBUILD binutils-2.40.ebuild 13944 BLAKE2B 011e8f396d7ce160485844ba07a2c8ce31491415584e338d5148c2f4616bb2ba5b3b4bb4e0c64fb17a63ebac90a06501b57f8263b401e2465816e0c9c91f2c69 SHA512 989c87901d8e59a37f713c705fedeeac1315b2e820dc5aa548201f9a8f3d02cbca339e16a7fa660adc591d53f54933dec03ae87281839d587784ee9fc41e29c6
-EBUILD binutils-9999.ebuild 13877 BLAKE2B 7412a8b972250f2a3625215000d67f212fa7a4ae72e63659f9c7bbf31c01dbb1b178dad2b990e605b98d5ca3750b4a712cc66dd1b974ec5b9ddaa1d733328708 SHA512 d3d8cbed17139b8514a700a920a0be4737dff34a535baaa005afa8aaae8d4d1cc64f1c7d236c73d0ea9113db443657a6a7cd38c62d0385394b293c6ea7a1aa4f
+EBUILD binutils-9999.ebuild 14138 BLAKE2B 65094867d4d0eb69dceabb77216eaa0cb21b284fddb00b3e8830b9458d322092829839f78d5839e4b6a462072c50e6096da70ec78ab789458f63d8ab8aa6879c SHA512 33ccf13969d96337d65a0dde8e918971318f801d2b6f4595119a5c0e7e9015b1bdb7e4e64830be26a8dddebb02a6429adfda8b80493a6fda548c463981ef5bb0
 MISC metadata.xml 889 BLAKE2B 9a627ab3db90639c30e19df93a064f9129d684ffe1176159d526ba7ba2e68c4c2cded8437382ceb97a5e2578fe79583042f6914a2b7650bb777ec1ce6bebd425 SHA512 b691e0335c2b059596557a3943047b0b8e718cc84c4fd885d44fe9887d3d170fce1317ba9949c3921a6e242434a24041777967e67beba911edf6932fe9f3d3cd
diff --git a/sys-devel/binutils/binutils-2.32-r2.ebuild b/sys-devel/binutils/binutils-2.32-r2.ebuild
index d19fc5bc163c..df54d7b7423d 100644
--- a/sys-devel/binutils/binutils-2.32-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.32-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -162,6 +162,13 @@ src_configure() {
 	# Keep things sane
 	strip-flags
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	local x
 	echo
 	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
diff --git a/sys-devel/binutils/binutils-2.33.1-r1.ebuild b/sys-devel/binutils/binutils-2.33.1-r1.ebuild
index 2fd7c51dacb2..04c74a25e107 100644
--- a/sys-devel/binutils/binutils-2.33.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.33.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -155,6 +155,13 @@ src_configure() {
 	# Keep things sane
 	strip-flags
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	local x
 	echo
 	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
diff --git a/sys-devel/binutils/binutils-2.34-r2.ebuild b/sys-devel/binutils/binutils-2.34-r2.ebuild
index f135644d0304..941890975f99 100644
--- a/sys-devel/binutils/binutils-2.34-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.34-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -152,6 +152,13 @@ src_configure() {
 	# Keep things sane
 	strip-flags
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	local x
 	echo
 	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
diff --git a/sys-devel/binutils/binutils-2.35.2.ebuild b/sys-devel/binutils/binutils-2.35.2.ebuild
index 88e1395e6322..3e9e6183b4cd 100644
--- a/sys-devel/binutils/binutils-2.35.2.ebuild
+++ b/sys-devel/binutils/binutils-2.35.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -169,6 +169,13 @@ src_configure() {
 	# Keep things sane
 	strip-flags
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	local x
 	echo
 	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
diff --git a/sys-devel/binutils/binutils-2.36.1-r2.ebuild b/sys-devel/binutils/binutils-2.36.1-r2.ebuild
index 2231530b7f36..dcaa4a446b58 100644
--- a/sys-devel/binutils/binutils-2.36.1-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.36.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -164,6 +164,13 @@ src_configure() {
 	# Keep things sane
 	strip-flags
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	local x
 	echo
 	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
diff --git a/sys-devel/binutils/binutils-2.37_p1-r2.ebuild b/sys-devel/binutils/binutils-2.37_p1-r2.ebuild
index 712f1d46b7a1..333ff355ede5 100644
--- a/sys-devel/binutils/binutils-2.37_p1-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.37_p1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -170,6 +170,13 @@ src_configure() {
 	# Keep things sane
 	strip-flags
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
 
 	local x
diff --git a/sys-devel/binutils/binutils-2.38-r2.ebuild b/sys-devel/binutils/binutils-2.38-r2.ebuild
index 401310d2e924..bea67260a9ec 100644
--- a/sys-devel/binutils/binutils-2.38-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.38-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -175,6 +175,13 @@ src_configure() {
 	# Keep things sane
 	strip-flags
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
 
 	local x
diff --git a/sys-devel/binutils/binutils-2.39-r4.ebuild b/sys-devel/binutils/binutils-2.39-r4.ebuild
index f0baee70d145..3adccc27a417 100644
--- a/sys-devel/binutils/binutils-2.39-r4.ebuild
+++ b/sys-devel/binutils/binutils-2.39-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -171,6 +171,13 @@ src_configure() {
 	# Keep things sane
 	strip-flags
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
 
 	local x
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 9f4fe6d456ab..1f81a5189b72 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -171,6 +171,13 @@ src_configure() {
 	# Keep things sane
 	strip-flags
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
 
 	local x
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index cd4fd1f84cc2..96c2824cf29d 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -18,7 +18,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD clang-13.0.1.ebuild 11294 BLAKE2B 260d3fed4578927cf654a3f364466a4d40da4526c4bb73438a63392105d07974a380a3a2cba1f1b2bfa3c99545e1e423a4953a15c58af81d860a02fcb7212d34 SHA512 ebb91165ea8a3f661c8d8cabca3aba073b6021d9bfc42ad5dd5e9d177c532c5aa1be9b403e9199ff3a4aaef339340d9113126ded20643463f28f5137038eab9d
 EBUILD clang-14.0.6-r1.ebuild 11719 BLAKE2B 116c47c61ca5f55544a886a81f1c443ab0d81d525d3e0e2137fed1aa8a872d0dfa5b0e9734ede6832cccabf141f8f788672c717f4e8c66df95ec0065cf5f1e79 SHA512 f27cd603fa3b02b9a3cad09231472a7047c2d6cb057a9b85a5ca7a9de93e7ec2c35e578cd50dd187886cb34f8fa88e32d3cf7f51c0c019b7b2ad232a127a8f38
 EBUILD clang-15.0.6-r1.ebuild 11954 BLAKE2B 1f83a038f9632948caf8cd8fc598337a09960405755b37480a7eaf5767b252b07ab096e3b920c76e68f5f3cc1d72cfd41fbdcc9e47a7ce7c2175f2a2e7933b50 SHA512 dc11d666bfcb47b79b41cabd974943eef0598d2116c7c01ded2c578b37afa7c93749b79b21a71504b2a684de4e6a2dfcb4b3f5f250b79c95b5a3287dbf5da685
-EBUILD clang-15.0.7.ebuild 12119 BLAKE2B 09e969751fc7ec0ceecec0f2cf1ab39c5ad4e8a7627fdbe7ac11cb715d75e0ac4477f6042e96c8bc8d8d235ff798fc30445fad7c8c84d1e5b7c6024076f5f5a9 SHA512 e0aba6bcdf984a041d609c56720ba39c13b44b3f3a60ea68827c286384b50322ba4adb6f3dd052ea709bf3aee438bbf88fc913e2c7c4224ca4fa7beeade1e188
+EBUILD clang-15.0.7-r1.ebuild 12121 BLAKE2B 7daa6393caa38cfaa417068ba17f24f7ad11aa7be62f3ce2d5592446f4dfea7e09c12b1ad9cd50a7a4938dec792da7317d61dca7301a4863f75586fcfccad8b9 SHA512 c451201f12d232c16b4770367372e29d1566bf0c239729af4aa815292569d75bb29f30db29ac383994d97f34614f0b89a512176168cfb563a41a939c78829869
 EBUILD clang-16.0.0.9999.ebuild 11788 BLAKE2B 7deb9b58a10ab522dab8fdc25776977fbbad9cb853c434a6257c3366a491e95e24540cb2b0836e914aed8aca81dd2c8c5a9074d3d92c00246290a8fb3a6b4500 SHA512 3bcb09c09f369dac98d9873827c9fe3a4a1d9ac1935821c9d7defe1396023fcee63a9f9c7bc6c70a14ae2ebbd6fdfc0fc64397f7087a197c5e53df23317b31cc
 EBUILD clang-16.0.0_pre20230101.ebuild 11888 BLAKE2B 46d7463ac2022887874a597d172497b1e04b715c326eb629c5fde978bf36ca0229be7d06f333647a7d392c7bcfead3a8ecefedb2848689b5f0713e50193aace4 SHA512 de47068ccb31519b4eb8f782d5a81379d667913b39c59128eb4c0c22a4d82cf3818547bf393d18d392aa7f2309c0aabc4434986328cf55272bac86037f657c5f
 EBUILD clang-16.0.0_pre20230107.ebuild 11888 BLAKE2B 46d7463ac2022887874a597d172497b1e04b715c326eb629c5fde978bf36ca0229be7d06f333647a7d392c7bcfead3a8ecefedb2848689b5f0713e50193aace4 SHA512 de47068ccb31519b4eb8f782d5a81379d667913b39c59128eb4c0c22a4d82cf3818547bf393d18d392aa7f2309c0aabc4434986328cf55272bac86037f657c5f
diff --git a/sys-devel/clang/clang-15.0.7.ebuild b/sys-devel/clang/clang-15.0.7-r1.ebuild
index b762826958d8..66ccf3abc32c 100644
--- a/sys-devel/clang/clang-15.0.7.ebuild
+++ b/sys-devel/clang/clang-15.0.7-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://llvm.org/"
 # sorttable.js: MIT
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}g1"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 25b4680de30f..16e3355c153f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -3,6 +3,7 @@ AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097
 DIST gcc-10-20221208.tar.xz 72098912 BLAKE2B 8167b3d91fb95c727caa3a76d8bd6d70e0d0bd79eda72305f3005c9f7163dcd425c75386ba55b2d71644ecf83d998a4bccb6fd265bb615dcdd104f27cadb8e76 SHA512 5e49159d86300eaa4c2f34fb3537b5f257931e861a1a1217dbabcfcd5ef9da224d4a6023aaf8d24c8893ecd204ec0cd6e96349ae0dd445d62d92ebb041aeb054
 DIST gcc-10-20221222.tar.xz 72112292 BLAKE2B fad78a6bc00e23909fa4c441592e61311709efa770ec713c44923f6f088c1185c52022cb9fa2e13185e644b655b16f7b4f4247e93bc82925ae44b2580feab8dd SHA512 34ecb5def4152e69c6b2a5fcd111c244447f6c53ed4359516923331af4634e67b803635ec770f24fc7dc12a571918d523fdf4f23d13e7aec927a05f8c5b83090
 DIST gcc-10-20230105.tar.xz 72113116 BLAKE2B 4227a8ae8fc3b266a63875b7ac84aa9d1b91d958f753703560f628acff0591eb72a4d3ac1725f2a80ded71a198b02af155fc7d177770203cef7148663ccc523e SHA512 970a2df219b01775111bcc7f2652d2743fdaba6b9c15e53b8935ce87b2f6babf7ceab0e41d3e115a463be1639e9270eacd70df8763f78ff9372890ca615ddb08
+DIST gcc-10-20230112.tar.xz 72110200 BLAKE2B c18245631957eb815c78e4429418314eeae6235f7021285d85c41327d11f8d3f9ba4f699f5c5b01148c3ec35bcd18325621ffc20ca1e65a9f71dd45ade4aab77 SHA512 6d03728f46055333c8dd04f349e36aec3157ce8ea9b994561bf354dd4a59f346830dff08306aa85206c90d3b9695190a7ee9144e6795c69e38279ad6bda20e13
 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
 DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758
 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
@@ -12,6 +13,7 @@ DIST gcc-10.5.0-patches-3.tar.xz 17292 BLAKE2B 403b3955756c060fa00cdc55c29cdad58
 DIST gcc-11-20221209.tar.xz 76240768 BLAKE2B 3be0f1ece4473bbbf10f7242102f330a6e246c8481da5bd32620dcb15d2acd008bad60d2576a301f03e444e3d93a3c72d5184740c6fb3de2bc05e1863b68a0bc SHA512 33d9581d434c012526eb4d49a4453cf77c57b459fd43f84e49bc764745e0772939eac007e119269f4f1989755df8678613732a84474c691b0c2452237c5b38a3
 DIST gcc-11-20221223.tar.xz 76237128 BLAKE2B 4d50d3a296bae501dd4287ca7c877304a60b1a6d444b96598ff2e018f4cf540896c675c11a99cc127acfbe7e3af38d603f6b80b7049d9e525420eaee7c0f81e4 SHA512 efbb26ce3b8a5ffcc36ad84f797b638c1d8d0a1fe61e3d9bd984c0dbce0a887d1384f8644d71f4b25b22ae2c67fedcbc4282780a2b834a47a318ed558fd9e0ed
 DIST gcc-11-20230106.tar.xz 76214188 BLAKE2B 0f41b47059816e2b5759e5befec8ef5c1fb63ef0e1abb04864da1cac1afad3b1e7ef136142a80aa2f8f54bc669bc91cab587df9883a5c6832999ff1386354f20 SHA512 f693c696332e3549edd5b7205dac6dff27d73382a9655b1df26d8a29f5d1e8e300520f735fe381e5f64a56927775e9306be83b05642213b03496e5827cc6a767
+DIST gcc-11-20230113.tar.xz 76197592 BLAKE2B 72144c0ba359ca92e61d167d9b2c7b5d5e58842c06a83176f02fc040b9018ae1ec9450372ae4e73e9ab8ab646eca19a14deb1466f930f1cd6e9be0bb769e5f9c SHA512 6182f88f9c7c96f44d198335d262a041e943f9cf764e9c4a0e2101b74256e75cc37c60280a5758e982866d95c3170a5031856df8bb547abd9278ecd9a1a03100
 DIST gcc-11.3.0-musl-patches-1.tar.xz 3856 BLAKE2B f511f8b4c0696771d906beee9645b5d009ea4b673602baa1ca562d6f23c5b0caf2012aae93578671624617c4286e3937d79a7383d6a03bb438c5b774a06fe8e6 SHA512 cd375ff2affb213475acaabf02989b1f05d719d972970ea0304d20a816986807390893d1401826f3b497787642f35d90a244195f8e466db41e8d768366057334
 DIST gcc-11.3.0-patches-7.tar.xz 15184 BLAKE2B 426f00feaa982a35d2c459e7a2c2e9d29b4b467ac3625ebd72bb31077c75bbf0c028137df03921c52ddc97a14d92c49777bd3f27b47a7b47d8a05e2d106b6bdb SHA512 bec8bf26b3e50633a5a2e0bb75ffeaba86becb704c14365ff3342e8d651ab75bb3ceec7808d88a25989b8c7182398184b95b6d1267aaef9aa828f687e4895e9d
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
@@ -23,6 +25,7 @@ DIST gcc-11.4.0-patches-6.tar.xz 14160 BLAKE2B b1c4348fe0ac1fa18f33b4079f81d68d2
 DIST gcc-12-20221126.tar.xz 79631864 BLAKE2B 3bb97ef4a1a17ab8b92b431b1f792c11131085a1b523efa08c5b4f995b44bf628be371564813e5affb1f8e2320bb8a9b04532e57b2deeef26b33f517783daa5e SHA512 163e0aa39dc5c24980f84000bd6ccd4b7c24581831b7a4cdbd63e4726be5c2b1933d034ce12c65cf95e4c0ebe1175af7e32facace465bfd7c7c377401350a2df
 DIST gcc-12-20221231.tar.xz 79647424 BLAKE2B 8e75adb993eedf38059ced571d2df160aa3a11ab855bbbba6be7ea8ad630ec0cdf470e432d6d80b794c1b326aca63cf0b8b673fb9c89330f52e5418e2aab8d43 SHA512 76fc6bd5b1e7711e4f2f7c391bc057a3c64db193af11cd2edb7bde5a638134aaac37012da75b90aea30da04b69565276f377266318471b4d123252cf3e5f5852
 DIST gcc-12-20230107.tar.xz 79636856 BLAKE2B 784529905807b1b8f7f3d988ab05e46a1f9e254ef6d3876fd491d344405fa1a626994222e22f612083c55f2403abc791f17da429652b7515c31671fa58373d5c SHA512 79e7caec8fd9fab98df629a70345ca414d29c027afc519a32c4adc8df28c15bb39ec1320a484aa5894d0e4abccd927fa2c5b744f2dc069978322b476fd00e40f
+DIST gcc-12-20230114.tar.xz 79651936 BLAKE2B 71ecec07f491ff1d2668ed0b7361288eff26f3b8304a81d5757ab75d0e170e6008d20af26a7d22d9d6782e002f4c34172a35f1e8344c36a7ebdb9602df90c530 SHA512 a0d4e26c45c590a580344ee30a77a097a11748c460a41b72f1b7a3e7b94c72988c4b3b7e0e9511a9957c14d6afc35e0d4a04cc8e4d313fc18e8fde15aa9b6706
 DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606
 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258
 DIST gcc-12.2.0-patches-2.tar.xz 13952 BLAKE2B a9e798911acaf45c3f585f69721130cfbecec016727a50ac0f4767b37a2ab9df39e0828abb07f1e429619cc102808f81af8422fef0265415c287d303d9d97fc0 SHA512 1808a05e98094577099d115ff5f3e136e3fc8f39fbe35c5183fd7775383f94439212e5e4174ab8d0ae8c0874e227ff84a958ffdfa1c99c9a8306a9842d126ef9
@@ -39,16 +42,19 @@ EBUILD gcc-10.4.0.ebuild 1445 BLAKE2B 05518ec2cdf0180f4db63dcab413097ca777381b49
 EBUILD gcc-10.4.1_p20221208.ebuild 1446 BLAKE2B 81b537066cd4a53c08b2bb6d037f8981e70f31fd9563dda1d825057e186f6d206e9a283fcde619cbaf323ef3bdff45a1bd84a530c2275c7e28204716bd0b012b SHA512 6e790aa4d4dfbfb77374a75c9f8ef72c6c14610c7f4778822d8fd16520350969345574104aa28f5656d1fc2ef0d6ab6b2177e12fb2ea1c62bd6e7975fc0d8c64
 EBUILD gcc-10.4.1_p20221222.ebuild 1453 BLAKE2B d173e10d77d8cc68c4bc2ba3874f8c3d2a0741c62efc17568bfcf06e0a0f0d3443662ef6551c9604c925b5e8d733f67ef5e1d25857b785d76b068007aea55a17 SHA512 8339e204e3646ee3b450a0c0463334ab372a22476195b43559948b35c74ad47b81723562345b4807bcacd93374bd63ba841fabb4aa5e25f9434dcf8b4c10d0b7
 EBUILD gcc-10.4.1_p20230105.ebuild 1456 BLAKE2B 61f843bd3fe85040d31d7654adc84e0e90bd04344c023820e84fb127b449cd94fd7a54b2a81b892f466ffd8cfb884aeeea0e2af88c051a2e8fad733b3cf13e07 SHA512 cc4e8da8ed5bebbd4a42835f723b6710b2ee13e8e245513e871e2540082f1c63721328c0f3628287bb15b30eae0cff6f2a43fed70723e39d2f603f542d812925
+EBUILD gcc-10.4.1_p20230112.ebuild 1456 BLAKE2B 61f843bd3fe85040d31d7654adc84e0e90bd04344c023820e84fb127b449cd94fd7a54b2a81b892f466ffd8cfb884aeeea0e2af88c051a2e8fad733b3cf13e07 SHA512 cc4e8da8ed5bebbd4a42835f723b6710b2ee13e8e245513e871e2540082f1c63721328c0f3628287bb15b30eae0cff6f2a43fed70723e39d2f603f542d812925
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797d156ea3dfca6396d27268385f1d5177c44bd58a926c981ab1c0c7b7adf5e4ea060a65a9e84e7f8ed1713701b0 SHA512 5193d1f4359ef8963645d25150731ab1929801eae16e94ddef3fb0169ed365d2ac43765a2d4848966508144e121b8b24feccbe66f59ee9363764d5a3db79f946
 EBUILD gcc-11.3.0.ebuild 659 BLAKE2B 310352b879c732515ce63983db79b32bf7c8c200a650627a14b5284fceea9a7e7f3e545044a8c00ccc44cd760b18123542bd233242cb3ebc48ef422439c8e430 SHA512 44c89a7782e5e37c5ef61c50d5aa6d07c09f19bada293ed657d7062837a5a9be9483fda0b1845ee794f42031ea098a1b88d439f7be202f4276f77748ff45815e
 EBUILD gcc-11.3.1_p20221209.ebuild 1286 BLAKE2B 5bb5bb1dfa617deb42fd1194fd51172e7865f6890bf430d2269ce0a5c27854b494e2ef2a997371dafd6328b2c59656718201ad0dae946911d18ddfae01ad9904 SHA512 d8242777dd4aec49d56319b7da0423a3d39a906cc78650e733db27a3021603fe7043cfd5f2e5497847ca64f7439ebaca20b01a2fb7264d790748d300d87377ab
 EBUILD gcc-11.3.1_p20221223.ebuild 1294 BLAKE2B c6aa11e60a7cd0d5906fb0ef055b53583472fb17a5715f8f3450ce13cad83ae9f04cb42f10b41b8905532e0538b78e36d6fca8d56bf1550ee2f20b03cef0f4d1 SHA512 62e61d7502d140012879dadee28dc8140215b43a5bb24b4e59fce1cf697b5bf4d1433b887f8958d77c92abd3c7f06a2d4a90ae93bfc9baf1640b0d048132b872
 EBUILD gcc-11.3.1_p20230106.ebuild 1297 BLAKE2B e3dc918277a3511ed09a4c5ea22dd1c68be08ec1b043ce589e82466596016480add5d2ca25dc7ada98bf28c94d0df81645e38d83558d8e16df0c32bfb4a6909b SHA512 93d7ced5f7bae8cd8e1f7d1edd53f9276510e516e597336749b3f4af9b2a30162fa9afb72ae85fde9e808c249e057d3b5e39279bfa44cfc7250d143ecb67b652
+EBUILD gcc-11.3.1_p20230113.ebuild 1297 BLAKE2B e3dc918277a3511ed09a4c5ea22dd1c68be08ec1b043ce589e82466596016480add5d2ca25dc7ada98bf28c94d0df81645e38d83558d8e16df0c32bfb4a6909b SHA512 93d7ced5f7bae8cd8e1f7d1edd53f9276510e516e597336749b3f4af9b2a30162fa9afb72ae85fde9e808c249e057d3b5e39279bfa44cfc7250d143ecb67b652
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.2.0.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e799763eb447cd545ea5afd48460bc8fc64bd68c84fca38f2d4cdb7487a65b34f4ceedf335393964ec770c0a69de SHA512 62d1a2dfac584c8abe548ff03c960a9e545e34ee1bd61977413af1b31ce98e281b5b90a33be2c666f418a272658f5188e9355bacc51dd0cc7ff456bcc47f2edd
 EBUILD gcc-12.2.1_p20221126.ebuild 1434 BLAKE2B c82a53ce99f8086c28b24382978b2c34b083bdfb01ccbcb893b56b210ffef770c1e534fc134835ded4362f32f447b5fc82dc75e7055ca9554bcd194e8b166225 SHA512 2cf47d4df36a26f96a7700e390766397520a4598037b7dfe5b4770a4b43fd6efce4f2c13b730c75ba014fb31465f4cc08a399aea7eb62eb46e9b11f8ecbfdfdc
 EBUILD gcc-12.2.1_p20221231.ebuild 1434 BLAKE2B 47136fbf5ba5e3bfbb4a631dbd7e71472a4760b598396c8e21c1505e257c7eb9f3459e90311152df1878203cda659d8cbb542036b6ba2940ff90d15351b37201 SHA512 4ded3e25cfce0aba6e6408a8e0d9bca82dd3ae33d274c4ec3bfe8bb41f9e9e92cb4b849e72859751de33de35433a398b378b5af5c78c0e1577c4cdd3e5720711
 EBUILD gcc-12.2.1_p20230107.ebuild 1437 BLAKE2B 54d8427e57068f8ff2dd62cceab6896ae9f0c19b4a94ae0808f1ac4d29493bf90ace7e28473d8f35fc1e06f06bba259ad33f0976b691d704a1988d4f3bf3e85c SHA512 057be3c83bd2c17451d0a27011cb9addd2b6efca62edfcea25325c95de6efc32535147db1279cefcdd9d68ad6be0f8bd44af3dd68e81f66f480ae2240ac4eeea
+EBUILD gcc-12.2.1_p20230114.ebuild 1437 BLAKE2B 54d8427e57068f8ff2dd62cceab6896ae9f0c19b4a94ae0808f1ac4d29493bf90ace7e28473d8f35fc1e06f06bba259ad33f0976b691d704a1988d4f3bf3e85c SHA512 057be3c83bd2c17451d0a27011cb9addd2b6efca62edfcea25325c95de6efc32535147db1279cefcdd9d68ad6be0f8bd44af3dd68e81f66f480ae2240ac4eeea
 EBUILD gcc-12.3.9999.ebuild 1545 BLAKE2B 78fdc4a7b20d22bba137cba00e49d2249c5616bf1c4cf619162da1d98c750fb3da71fbb1cd4e136624cc4e0a112547e6c4c29992aa58ab12507917c7d728831a SHA512 f3562696a79035e64b8e79cee720fe24c7041bf922d79e5cff1ae864a533997995465d0871bfc4f87f6d5a66e7f8ac02c490792554a0628ae30d96a061ef9279
 EBUILD gcc-13.0.0_pre20230108.ebuild 1286 BLAKE2B 613958f9d883c696a477fe6d25782dfc6ae9c37af2169c370912eed43e7f21fd33ac2b5640b5cac0cf5ec964efca42ef3d0d1d36c3a372296f45e88c79a51bf5 SHA512 c7e0a73749cc56c95d60d8ed9326cb48d968e1ecb0905b3af6c0024d75e0ee8cbefc5c5ab2fbae6aac32348c51d41cfcaf470180b05243e3a55dd0c46f58f0ab
 EBUILD gcc-13.0.9999.ebuild 1252 BLAKE2B dbc0cdcbb6bae2177185c41fa014a0c98e05a8101f33e12975e2af951e25539117b9279573770b5d17261032b0c51d80864140417a13b152aa34739c28c0f0c3 SHA512 96e940c83f9e58b7b929c5293ca44582c266d3e10615f6aded5cd0b11cb1d46306382fea04227040a7d7cbfdc0f042e3b1c89a0e617193bbfadea50a4732e9a2
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230112.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230112.ebuild
new file mode 100644
index 000000000000..8cb4ccaa5b91
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.4.1_p20230112.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+#TOOLCHAIN_GCC_RC=1
+PATCH_GCC_VER="10.5.0"
+PATCH_VER="3"
+MUSL_VER="1"
+MUSL_GCC_VER="10.5.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20230113.ebuild b/sys-devel/gcc/gcc-11.3.1_p20230113.ebuild
new file mode 100644
index 000000000000..0eb8f03a6d5b
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.3.1_p20230113.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="6"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="1"
+MUSL_GCC_VER="11.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230114.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230114.ebuild
new file mode 100644
index 000000000000..7579ee96e4f5
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.2.1_p20230114.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="9"
+PATCH_GCC_VER="12.2.0"
+MUSL_VER="1"
+MUSL_GCC_VER="12.2.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 471414c6fd98..b6e21bdd42d2 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -2,9 +2,12 @@ AUX make-3.82-darwin-library_search-dylib.patch 394 BLAKE2B abd83733bc3036e412a5
 AUX make-4.2-default-cxx.patch 212 BLAKE2B 16ab647e54b27b2be8fe3b8abc37940690e828a1f68a21856377dec4b282ef489246f5de7c2b364654327166fb9b3f2a0dae755dc15db786c607c6d7f1fd76d1 SHA512 9b9be230f8c74ee438851d1c10409ebd188f818d04e99b799a353fc26c2da78d2e298b907287ceece7b6e64f9ac0908ae65e33c35634b9338b246225b63cb409
 DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
 DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c8111179e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99
+DIST make-4.4.0.90.tar.gz 2328399 BLAKE2B fc260a3c942b00d57bc64fc037e4e4a510000ec281194122e3315f0ca7c6fe3507877c84bff62e197f5df45e1d5d95aae347085e225377788ebd466a1327cb25 SHA512 e693e6146871dcaf5b65b6c05b620047b6c2a3474b02ecc58cf4698f88107cc7a7b0d35551eb209c772b09ea7db2ffde13fe984d6227339974ca54a68b99839b
+DIST make-4.4.0.90.tar.gz.sig 833 BLAKE2B b0a2d98f5a99ee29523c6b25be4b29bfb193773ab5b70ce26adf75a066e30ca95d79b111eedc656e817246cfaf7f9345014626b12de5a381e44e4b6f8ddd5be1 SHA512 7a20c6058221b1003a26806f65d7b568575f88187562b89b7593c67dfc2b15569cd92c75c23056b2a3ff7577f96794835f1b6d5d9f5f5b92c59acb3af8efc944
 DIST make-4.4.tar.gz 2307891 BLAKE2B 5b8a2fcd7610c33347c2e552fdc4f2698c9a4c468de588c9687cd11d15f120a37768bcd521231adf32359e3b48b27ab7b142746fd18b1a8d15578d34344f487e SHA512 4be73f494295dcfa10034531b0d920cfdb5438bc20625f863f5c878549c140e1e67195162580c53060c3c11c67a2c739c09051f02cdd283e5aa9ebcd68975a1f
 DIST make-4.4.tar.gz.sig 566 BLAKE2B 879e85eccd748a9e6687e8beaaf1321ad84986990290c34d34285eab96fe9d493db1e6f20178aa5374796da9c8fb58f87065ea2de44a6daa55dd23dcc8b09c8f SHA512 76b7ecb3aa38b0a6867fd0379e42d2cae6632f102d902ac604e7ea3265ac1c1090da8e5676bd56b9946dc291e57c06bb05c953f76714fe8bd27b924bb39301e6
 EBUILD make-4.3.ebuild 1931 BLAKE2B 84d538027ac0a84300ccce7f1b446407796a10a9314e016850b092f7e2d5d62dfcf96cc68d013f6b12d682cc3bf94ba4a97a7b0a6247314fee10d864e8ebf6b6 SHA512 2f764ad5b425038139fec36c56a194284ed34c0f2991d0d4c94cc81ea111ef6662646c3ba96968c2d13debbcdede5a0000abe091ff970b67c13cc49958d113e8
+EBUILD make-4.4.0.90.ebuild 1960 BLAKE2B dfa4f6945510882c3db0fe4a860ea4820fae1a24592c81518578f7af9067ff9080b4ab624eda00da0b9242463a75178a1893b104277df82dd27469a4d9f87081 SHA512 124335d012cc9a316c1d9fbd8d7dea64baef0407b11ccd1ce2ac4b5b00d84cbb3d0b84173f6aa57af815c43273a06189a6e6ee2cb5fade960fe2a3aab3f4ba8b
 EBUILD make-4.4.ebuild 1937 BLAKE2B e63f3a30b3032769736d408691c594cc08b40c0cd06fc0f548ebf62dcca4e67f793a6fa42c89ec40f329af2551fbb2928eb6c21ca1e704c802f4b0ff86318173 SHA512 158e77869d70fc1e0c00d4f1df036bf66a85273900c19c67626701986e9eb36e0a8c1899cd22c7af091eaccfe6a334f20f03e47ec6fafb3225f5740999f1d790
-EBUILD make-9999.ebuild 1937 BLAKE2B e63f3a30b3032769736d408691c594cc08b40c0cd06fc0f548ebf62dcca4e67f793a6fa42c89ec40f329af2551fbb2928eb6c21ca1e704c802f4b0ff86318173 SHA512 158e77869d70fc1e0c00d4f1df036bf66a85273900c19c67626701986e9eb36e0a8c1899cd22c7af091eaccfe6a334f20f03e47ec6fafb3225f5740999f1d790
+EBUILD make-9999.ebuild 1960 BLAKE2B dfa4f6945510882c3db0fe4a860ea4820fae1a24592c81518578f7af9067ff9080b4ab624eda00da0b9242463a75178a1893b104277df82dd27469a4d9f87081 SHA512 124335d012cc9a316c1d9fbd8d7dea64baef0407b11ccd1ce2ac4b5b00d84cbb3d0b84173f6aa57af815c43273a06189a6e6ee2cb5fade960fe2a3aab3f4ba8b
 MISC metadata.xml 335 BLAKE2B 5b17214450a474af84b5015059fed4edc919e53bfd407cedf0816746d95a3258aa90fb851a7d013f1ef10b61d689ead735f8ed35b109e12b45e7a4efab22abe3 SHA512 72ff31b31e5d9bf55124d570d8ff4911eecd2272492988919fc073e5864d4282e4acc3101c367076c1009e3af086792993fa96562c25699f1b537b88fed40a1f
diff --git a/sys-devel/make/make-4.4.0.90.ebuild b/sys-devel/make/make-4.4.0.90.ebuild
new file mode 100644
index 000000000000..abb820aa6eb6
--- /dev/null
+++ b/sys-devel/make/make-4.4.0.90.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/make.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="Standard tool to compile source trees"
+HOMEPAGE="https://www.gnu.org/software/make/make.html"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git"
+	inherit autotools git-r3
+elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
+	SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )"
+else
+	SRC_URI="mirror://gnu/make/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.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"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="guile nls static"
+
+DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
+BDEPEND="nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-make )"
+RDEPEND="${DEPEND}
+	nls? ( virtual/libintl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
+	"${FILESDIR}"/${PN}-4.2-default-cxx.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+
+		cd "${S}" || die
+		./bootstrap || die
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myeconfargs=(
+		--program-prefix=g
+		$(use_with guile)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS README*
+	if [[ ${USERLAND} == "GNU" ]] ; then
+		# we install everywhere as 'gmake' but on GNU systems,
+		# symlink 'make' to 'gmake'
+		dosym gmake /usr/bin/make
+		dosym gmake.1 /usr/share/man/man1/make.1
+	fi
+}
diff --git a/sys-devel/make/make-9999.ebuild b/sys-devel/make/make-9999.ebuild
index 73a2aedb6375..abb820aa6eb6 100644
--- a/sys-devel/make/make-9999.ebuild
+++ b/sys-devel/make/make-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnu.org/software/make/make.html"
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git"
 	inherit autotools git-r3
-elif [[ $(ver_cut 3) -ge 90 ]] ; then
+elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )"
 else
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index a6221bb72e63..cd5b8417cfad 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 7c95328cc15d..ee888b0958c3 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -2,12 +2,16 @@ DIST genpatches-5.10-170.base.tar.xz 4506932 BLAKE2B 9503a369d1d653fc08e0c244389
 DIST genpatches-5.10-170.extras.tar.xz 3868 BLAKE2B fcba4ddac271a957a8f2645fc833338bd2da71ded4cb935bf1f2df267f50fdf1bab0e2bb0967a3cae975bc7cfaeae932261ae0aab4bcad40b32546ff69850c41 SHA512 bb272928563d33ddf9a90db610ed013f625121f8a05cf497c14dfb74052300cae361474e71203be35949ace7aa9bdc23e98f2dedfe3eef885a59674a90166c6e
 DIST genpatches-5.10-171.base.tar.xz 4617172 BLAKE2B 7ab9b6676f808124a6e2996bd3ad36b1e76228ac969f16ad3956b50b31e8f5f12f3f4588afc88df42b157bd6847474e8cb1e1317e863ea63da94503ee0b73e18 SHA512 5243ffe0b9c79e75f1649f3deafd6293cb016475459e51fc4f298513245d974803a5d802c1670022840d1c087daa55e5d1133caa5e5b49b39d1aa1e7604e897b
 DIST genpatches-5.10-171.extras.tar.xz 3872 BLAKE2B 27eff9d6f83ae27c147de7910f5d8e1c43f286f3f3da6cb56caa048c2c226c28926a32fc40b47cb0dae39347754fd65e1f26ef9c350065cd7db62ee5935372e5 SHA512 bc82b100c55bd0c935363c10dc87607a8aa2539401ea6a1c6618d37deae072b390cb33e3075a4dab3583d52c7f0a79e30f2dfc8b0a6eb5fcf5f59d8a01020ede
+DIST genpatches-5.10-172.base.tar.xz 4831748 BLAKE2B 46acfe58044df90c98057fc25903c1af1ff3baccace354659b79b939ca6b2054488c8823c456620880e4af9221e0d26eadfd355aaccf4679989ce2e6077507e5 SHA512 8951a10959454b515269be97e163e73aa7cc8374abc7d0fa73243f67944bd1592051736ec06e2ce29ee01d4e0b79ec783d30b40664105f12aad24c9c4cff0a33
+DIST genpatches-5.10-172.extras.tar.xz 3868 BLAKE2B 32ee2c036c224c800ce53fa94d8f6676c70023bb733cef143355ed5907a4815cb252bc43d1660bedd841dffc814c15a9016d8c0d43b80ece58c9f4bf77c472eb SHA512 10372d1ab1d8bd73dc1c7412498cfb5ce91dc74d5e40c6497aeac24fb71d9c007d03cdbe58b2b7d6304af11816a4981cfc4bdefcd39da19009cb2f0bef9ba5ea
 DIST genpatches-5.15-89.base.tar.xz 3552056 BLAKE2B 2131869a216e9e99fe893e502e9dff10ef486fcbd0a130db2621ecbc61194d4f224745d146213edf35083752de89624346eb7fcd7c2fb53f414d3ddc200b5b51 SHA512 ac840d8ea832f5a388ace30cc435501112992a16834dfd01bef764683b415405b1f9fa644062c8ca3ecb18739e55133f2282281436847d9ceae8fd6104dc583e
 DIST genpatches-5.15-89.extras.tar.xz 3932 BLAKE2B 25a5b47eed2412b6d660572c266fd8d22be0c3e570dab6d45a7e6a0015227a1b4cd468582bebe3ebc7f47600d3ad30a5853dc2398e39ae02352a1b5df1faea36 SHA512 b4ce39a33610e5ff1c3309f787dddca702e55d81b19dbfb9300386a246e758ca9192eb98189ed01ba138d38947fa35e27dc6d3b459da059807bee93289845879
 DIST genpatches-5.15-90.base.tar.xz 3757428 BLAKE2B 30e129e5362a5fd690d8273a36e102510e113415e3241f838b366c2e35dbf1b95fa30d6e34e6e36c5d938855aefcc66a039f1242ea8a69263fdbaf84c46434c4 SHA512 bca6d1252657ad611a71ed2ea128887b131f9dad83f4c0007573b2637fd79b117023d0ade5b833070a8c86ab4f698d0b3250e01b612a0b65515a164fdc9d1212
 DIST genpatches-5.15-90.extras.tar.xz 3932 BLAKE2B e84edd591a94f2d21593f86aa7ed2a27980e099b388f49e899655dd687d459be87491c6441b73a5c024c43bb81f74103ef226d3bc3ae42d089749db0b06ccf45 SHA512 687240f034abd1e91d85e057bae2693129ef6fc4b6119c71df00c306ae2d1cc64ea294a76ce8017b7f2b0ac557c41b9ac70d4fb466ca2899a3c544490421df45
 DIST genpatches-5.15-91.base.tar.xz 3838856 BLAKE2B e42746d0b7342cd6e2ab1b6b907a202277365a4fe52df5eae5d3685c68efbcbce58ab1c6d00e0b89c1f581f6818ba830f35af96d40e1bbf80ac824b0be572715 SHA512 37b31c9f878dc1cc4c5446fe7810b6fb9caf556296e99975de1e37bde9e798f5f74e90cd6d825ae1f474bbd8ae31da3f07e5527d3ce6aff42761ce8425634949
 DIST genpatches-5.15-91.extras.tar.xz 3932 BLAKE2B 139a9a7876504ce63abf76db63904b3b4330ab101ec7f0c97717ee83ff861595df31a36f5fe4fbaf3b70641e6029e399235a7ec3e26feb98522c57e6b4b5d71b SHA512 9486f83b99c1f0bcd23e556229c7c0947be4fa097d688b510b6d57d94584e6fffcc9a2412c3620ceeffc2b347fad1ea1e12f58b2f0629cf93a2bde19f567ee5d
+DIST genpatches-5.15-92.base.tar.xz 3843196 BLAKE2B 1a70c672f4ceda221611ba1bad20fc4e791a51e27f412995308cb7f39962c6e237efc1bb7912c67b8e3dabaffce3bb6ceb55d62f4f12b79671910b70c1e7a8dd SHA512 33390b3e24783405971f2eacb24e715faf841a66e477a03d4055d61694fa72694d7563d799b95d47037ad0d7e7c234e56c894ddd7cd1dba59077efb901bbba26
+DIST genpatches-5.15-92.extras.tar.xz 3932 BLAKE2B 12936d0ac139d69f2e5947436ffd34add80625aa383aa23e51b4419a5e2ad3c38ace4d69c9e7066bfeae32ab727013e602c3a1c3424e128562597c517c7e5903 SHA512 6595eca7525db97672a15275228dbb9b14e7e234514b549e0fc17daeda4b48d298f6dbcde46e5862fe02bac9f50ffd7b05d82a174541469456289bdc6eb7f4b1
 DIST genpatches-5.4-233.base.tar.xz 5294692 BLAKE2B 357046687c6f2797d5d7090dad357e00675eed329ccef44223dd476551cf04e9f711f1020144cfc59796657cb5b1e6d76b607ecb164e27636869a8bc8984f567 SHA512 45f6b35dbca12e8b9e6a9f99d12c44e47a6e471e5091ab75c42346f1d8bc12dc454cbb335f1549b497842c2d9f13a5930c80b5000cb86bd3db7b03347dfebcf4
 DIST genpatches-5.4-233.extras.tar.xz 1812 BLAKE2B abedf631da893391a98a98cf48d264f9eaf9f9f7811bf595c36a774c8dde21f105afaf6f4e113e04de472bd6ce0c759bd41fd95aa980b7e05499d8571f3e8a44 SHA512 16b09d0a4465123079360ef9f070e0c163f45f9784714e98fe53f7174e836fe7b2562af01e5c2dc932571bb3eafe2d9afedfd60b5c8467bd8410de651ab82473
 DIST genpatches-6.0-15.base.tar.xz 709204 BLAKE2B cba74ce5f9a6d8a00991f87fe33771f615640c8c3adaee94432580f5df51cb2a488794a376c9355d568ab4b3014fe23e4c9fb000bb9ed6948b4225211df862d6 SHA512 64d5d04b8c1b3c3967fd22cfd975b7f9bbf37e7d7d4e966c7017b589837cfa02200a80880f13ac52942fd845c9835143d809817f5517c91992e30e101b15c775
@@ -30,6 +34,8 @@ DIST genpatches-6.1-5.base.tar.xz 416352 BLAKE2B c3aedee62099a942b85016df0493ca1
 DIST genpatches-6.1-5.extras.tar.xz 3804 BLAKE2B ef944c72d659c38fcf1d279693fa3c1a7e2aeca6fa5d706699dd3f862247d0f0ffa2522a326aa896b57eac985417d04ddb652a260a96924b97c6dbf9ae940562 SHA512 e7461ef3c47af3b6c4e9861a95dacd56b71bef7a518b69abc0ff94b40fb3beae0d3fc04a16ff80332cebcfd16eff0ffd334e02377d7e15bb1a824f51ee143173
 DIST genpatches-6.1-7.base.tar.xz 470576 BLAKE2B 09a0d003fb9d121c51423d05729a9a72b27d5eb57e0e671d454cf14a8a72a1109a5d869ea25792602e3f7a53008d3ff7b568389b16400ff7bd04c9c1ee311a59 SHA512 80db2cdacffa2ac85830ebef934c33345dc113f5ccae252ad18201d322b7b4ad4bee5826e077cba4029f97e871fc16ce22fcd994d58cb787c71c746088cccc34
 DIST genpatches-6.1-7.extras.tar.xz 3808 BLAKE2B 1640a94b258538c462e74f566b290e18a6c88a1993aad96e9442b40c498d8a8dd33b634816f53cd6ac39a1e95d9b0f9462d345970c706e3424ec6be8ff99d902 SHA512 e843e33fb1fefd0f3e0e426132ecf56dcc9702cca1d57cde74e4b43d414acc01e0334b3b1bf767391c2d1bbc4499d5e73508778b47ec849b256569392d77f84f
+DIST genpatches-6.1-8.base.tar.xz 477364 BLAKE2B 29fa8d45feed6333883e1f4733ace6ed52b5424aeeada3e71917a0e3d85f87a7b99f0863ff468e678ee5631c6e0f0dd7c3a0115a58d80512ac1a27d58a2df149 SHA512 d1f32215ced0ed39cc1c6d224b1a12ae3f80bcc19f1ea23189e853367ebc661c74d17d335bd615c2fc1f3c21271f6f170a35caa38194b2dfd09f78e405739ae0
+DIST genpatches-6.1-8.extras.tar.xz 3808 BLAKE2B af83b01895f1b3af4c0220a89b0dabc3642e578920475402c02dbe0300c520dbc621a2245eb66842addac48565c8b612198138c49491dca7909d594a9d2ef818 SHA512 22f9378bc7b4413d60672656c2e73bfbcc6debd10179a0eb2b523bceb5f3adeacecbd433ede3aa057143163a9cc2971d5023d73ac8187eaad59508dd229feba7
 DIST gentoo-kernel-5.10.161-1.amd64.gpkg.tar 66498560 BLAKE2B 6614aef018fd06c61edd76c8526a96d72f73225ce915fa8bebcf835bf1a92de5f3bbb6c9045cc2cf38c326b15d7d00b236a609b8dbd2f50296ae0563d0b01c58 SHA512 e370627c308d0f9ad1cd9972677a61d2dae152e8cb849dd772e3d1d60d3fb4ed195ae048705bed4bbb663c6532cb1465947a31ada825a3fa66e2aaf089acd115
 DIST gentoo-kernel-5.10.161-1.arm64.gpkg.tar 59658240 BLAKE2B e88ccc74dea87976843b87bd96ed1704d588e519913d4376cdbe80cded1e3a4370b9c3cf692e510732ef15505ab5497db1d5c5091b523457e644793b0dba6c0c SHA512 8f7648ecd4e99c3ebd8bf67f33924df60693cdad47f027c75b8a68bd3efae23defe9f1caee2f2604d58b931439d557ef263c98a6a6eb6171c7a2b8b91f2b1d60
 DIST gentoo-kernel-5.10.161-1.ppc64le.gpkg.tar 55050240 BLAKE2B 97a879d136891448fa86f598de5ebefe875bbd2b35c89ebd882b6913cf02a82de9981afdd25d758649aefcfd977edec2ca11d603271bdb17a76097b3333cb3e2 SHA512 2f5f0a2dd49caefcafe44ea8603f615be5487e1109e6aaee21553e6b4d9b516e8b0ddced4a85cdc355d363e9ddeb431b9c7c3fbc1806bec5d4bcfd36195c77c7
@@ -38,6 +44,10 @@ DIST gentoo-kernel-5.10.162-1.amd64.gpkg.tar 66498560 BLAKE2B f3825295f7b65e7581
 DIST gentoo-kernel-5.10.162-1.arm64.gpkg.tar 59668480 BLAKE2B 6207a761c00f7ad10d4f733cb7cd8251354786fea8c3e339ea3b5ae09882bffdbe9b4e30eec10ff06b554c7c914f452d7a0da4321ef4d4f03566fc9b1e4356de SHA512 f4ed1976e2d9325e7d188440d0797bf5b07ac60d29dfe8573e8a721fe42c948d13e8a0c76adb7aef2ddcff7420fec1505e81923e66d1a32677e9b206feba57bc
 DIST gentoo-kernel-5.10.162-1.ppc64le.gpkg.tar 55050240 BLAKE2B 359a8cf556e549960cafda4ef108f66cb1ff01f3e6d0a9c850365d8bb9f0f65221b0a4711ade4a2326edd45209ecffa1e2dab485da359e450bb80493aae6019e SHA512 f6cebe6c889444b83251eb1be08a54fc3629ba2f226792dfd406a76fe85067ed48abe79e3b9bcb5b71b560460ea45527b813349358504d9938e4b02dc4151781
 DIST gentoo-kernel-5.10.162-1.x86.gpkg.tar 56442880 BLAKE2B 240127a3fd2c39d9a00fe03e161a58c323d6e3e8cd89592217ec6b8d7a4b95033f6eeacff27cd30fb4995dac5b675ace1375b999ad15da2cac6844e8058e4ff8 SHA512 7193db90ba292da179de8035fc71c36a9cf10e78614efce19c84e4a4fb33f0e2894ba232bc9a9ef5a141997e3b4dc2df86f93ee812fb753082fb3d1fee304ed1
+DIST gentoo-kernel-5.10.163-1.amd64.gpkg.tar 66539520 BLAKE2B db354db6d769696f6f708f3329420dcb304954f71c76401594c4c2b02e60d5e3f271d1e4531dc49a267835743eb7441ced1981cf0ef00b0adca30aea1f562595 SHA512 7ca27b561405a5247fa05ec969705f2efa3fe315255aa745ca412c9231b4ec267ea129984aa63d718b2a574cb103a996e83fdd43ed468076db49736ebf12aca9
+DIST gentoo-kernel-5.10.163-1.arm64.gpkg.tar 59668480 BLAKE2B c75893bcc35fb0102c718a1848c1973795d9cfa54ce4b203c0461409e65e6c1eebacbb554a0c859c35c8f87a2a9b33dc2ac5d72859fdc8769e1e64db2efd89b9 SHA512 1db8b0d5b5309755be331d4dad233c02afd6bd82a1b7613e10101a9e8d077299ee967f6e007b11f815a496f1733879cd61f88a861e43623521c1bc8b69512364
+DIST gentoo-kernel-5.10.163-1.ppc64le.gpkg.tar 55029760 BLAKE2B 612963d75e798c2e2e295d7d4e00fd6fd15cf494aca11ee59926cbcbcad5f0a945bb263cb2155eb138fa0195cf85a489e44d1aca0cbe32d5d1ed42d8401eaa6b SHA512 215dd62c513394a4b78f6cf57f4706a71daf4a06b76c83f113b6e357a2f0cddb3a8e46324a520312918c31d5a05d0af260cc4265ea81d339f1b494b2b6c1e3fc
+DIST gentoo-kernel-5.10.163-1.x86.gpkg.tar 56453120 BLAKE2B 0eeae5765fc1aa70025598b3acd2202514284e61b75516142149740a4458e99b23379db80d05c4c10ca3deadacf732bc03aec650412ad4c04f1fd7daaf45a4c7 SHA512 b9508b6c78881979ca14d37a427390a3debd175623ec47f8e28350d8abd5bba39f0a331e3d8e4aff650a789fd66bbff66aa2d1ddf851d2f0f365c37cc9be8d3d
 DIST gentoo-kernel-5.15.85-1.amd64.gpkg.tar 69806080 BLAKE2B c8a30ead36075a73121fb0a9fd3f924d1efbc6fbf38bbc5d997cd5d9d50dcf6daabc4ce9501ed31c151b847c7a80dc4a86db50a2491644245fc6c2822b360eac SHA512 5b36794fe4076bbc3ceae8939ba15c2aede768d03acaf859a349d23bc28d540409655c7731a0b6f671a67b789a4563dd21d167315bdbebe9bb81462c4c72e3c1
 DIST gentoo-kernel-5.15.85-1.arm64.gpkg.tar 62873600 BLAKE2B dd718f470550c4243b13dbcb3c2513fbbcbc168554b4fccf483689772a59c6bd92342e80ecaced38e2c5ad139b6cc19fae54c6ecd90f3d58bbef5e7bc2692799 SHA512 6c056798c28245c297703b97859c2219123ea00a8ee816694ddc186f5694444c5854c469b52830e9c2f3d4978b469d83707626e10f9cae4472c29ea8181d4472
 DIST gentoo-kernel-5.15.85-1.ppc64le.gpkg.tar 57231360 BLAKE2B dea31232116da911864d2ce1ec8a62e2959658ae339483fa23a3251fb98cee1821ee51a24041b711bfa317f9b4c2443f1c34b4643ac9b8be3788b04fee0bcae5 SHA512 de537a3f7e0059f94b6b7de56776e10fef13658aa464e54e528cbd5dc78eb5fec41b0c428bc5f106d16b87745fcaa4d767cc3b5843c83de26a5eb568f9afe613
@@ -50,6 +60,10 @@ DIST gentoo-kernel-5.15.87-1.amd64.gpkg.tar 69847040 BLAKE2B 56722f91d5aad571d62
 DIST gentoo-kernel-5.15.87-1.arm64.gpkg.tar 62894080 BLAKE2B 6f32b227d21ce827e458375db7125a1906d87e33abe0e71c420e8cd021f803c24da15bbc12bd498c8cdea30ce563325ff1317d1be2a07bb5473f2f7456090446 SHA512 de51f2e6c3855f6d2f5c5d05f3c81857a5ee115da73d07f554760832f4d6049c3472b209b1ab4a4f6376a902372dd9a805f218a859dffaf171dcb25b36bca794
 DIST gentoo-kernel-5.15.87-1.ppc64le.gpkg.tar 57241600 BLAKE2B 3d1eb4090079858e3a7e9e16fcf4b60f9874accf49c9077d73544a20dc2400a02bd55ba4c14c538dd7654e40eac70998fb51f18688e1091a4cb6ee7908975cab SHA512 8160793c72b9fab27866c68c9b351ef0bcbb41a730f4dffbc3bfa3dcd941afb370bd8d452433a98f3fa065c387bbbbd3108b75067488f7c3302e26c84049fa6e
 DIST gentoo-kernel-5.15.87-1.x86.gpkg.tar 59176960 BLAKE2B c167bb32e5aa6bf7a06b36a326f275c3e657df8b62892c4bed7195f619763d4e1422336e1d6cae520edcf4e8a76139016b9cb3e580574371830b8b9d1e52982b SHA512 4c3f86b7fa95f6a1d39aa3f443f59fbd7018ad9f24dc094cf0f35c8be513c0937d9be9991c8214aa7b4b7deadc828b3e2ec47c15cbbee404493b4404777a7311
+DIST gentoo-kernel-5.15.88-1.amd64.gpkg.tar 69826560 BLAKE2B 9c32c9a590770f2b15e67e62066265cbbf82d09ce9daef7af5522be320eb98eb13714425f842c6de038fee83f7a2166c2113c77acfb6044c201b39e26d36f1e4 SHA512 9143d0393203eb00249916b84b0699aadbd8af5dd5e4376ce251ef77a1018ab647ccd7a370e2724b6b2f72d077ba9fc3f2000ecc8518295e975cfc8f464d9df2
+DIST gentoo-kernel-5.15.88-1.arm64.gpkg.tar 62904320 BLAKE2B 8edaa87b1d574787913d9f0e935d3f79505aaa507069ba8bfdf4acd894582adecacbbd429554e02c569aeef975eabeb3285f9cabb1e9ca5aea4d32487a5f298a SHA512 6f41644cbc0442f39d79c54aef05d64fed2da2f8dff1f906cd109470a7c12d2b67732fb5b68959e3393db99972185fdb960dfc22c153992da3632ed2bf9f382e
+DIST gentoo-kernel-5.15.88-1.ppc64le.gpkg.tar 57251840 BLAKE2B 361eb1433ee75820bdd85ed39960681b091c42d7cc7004540e4a6f60e8636569463e18d9de785f98d4015463f24dd58b1da368ad97a431e9fc5f13e9d2a98194 SHA512 c9ebe0f7a184a7fba4bc8532e7b66ad652b2cf9f1754d6267c9534673a62940c8adefbd50184655920a6518634bee9b97f1ae3037b39862ada64344ef62f090d
+DIST gentoo-kernel-5.15.88-1.x86.gpkg.tar 59176960 BLAKE2B 0cb72d5dd890781d07bef9ebf995c08b28e94c42c8ab28bd6d44eec0371a268c6ffa1e48a88f162ef15d902c2e0c89bf90e359bcaec14156ed67c897a5298a61 SHA512 c6a401216611e8473913d38a8f5af4ac90c698e2a4ae298e1b818e1316aff311d4924d74676d5abe369d55d9d4a8d8e55a0ab74046e13ed7607fcc2fee472bed
 DIST gentoo-kernel-5.4.228-1.amd64.gpkg.tar 60620800 BLAKE2B 99531b57d6e1135e239c1b392c475dadd2e5cca94e05921a529c0b7ed8246c23087f9fa2d7a3b21d316b3dc5dfeb6f49aff492b1b7d112cfd1478dab8467d21a SHA512 50803fb2b45891c6ce342e16d7b3968587f5dadbe26f3937eadee59678ebf23db1e1add37f3bd1d7dfab27d270a0f403b09b279790091a24fa81ce99a490112b
 DIST gentoo-kernel-5.4.228-1.arm64.gpkg.tar 56821760 BLAKE2B 554bb0c19cc971551647a7d7189264808e2cb8145fa091ae16758ab7593d6c3707e23cc88501c1ec5e86170c1d91d94a080eed7dbdec2210640af8ff4b2cc7eb SHA512 e20226c43556b0fd33b267833de5ced1d3b7e8b6b8ffa060c5b61c5a96957b5a0825d569ea6a662dc8d4368b1dd69ab9fa2a42ee57d53e8456be1e927f766fec
 DIST gentoo-kernel-5.4.228-1.ppc64le.gpkg.tar 54343680 BLAKE2B f85a074a1b492655d14cd95b1c966b1bdc4dd997288475204810a693361f9dd17ee3d3c519a413dc157a3e5a2f47ad79c4d596a9b7b1144f6c62c4ca4dd8f577 SHA512 1025fd90c6b32f165fa37b2d27db25b1c5295f14fe55865104431bd512e2c22de58824b309382e6b6445401ec43168e4ecec31fcc052df78854333fe58ca9f71
@@ -94,6 +108,10 @@ DIST gentoo-kernel-6.1.5-1.amd64.gpkg.tar 76728320 BLAKE2B 38810ab12d580ca28ffb0
 DIST gentoo-kernel-6.1.5-1.arm64.gpkg.tar 69304320 BLAKE2B 33e166cc84eb3204f804f77451e0caaa2306582bd097f8ac64d6a2838ea99358d36ddfbe5b8f3693f983192f75535261ad6800fa585c6940567a2756bbd3317c SHA512 0e777196bf654d125574f864145eb8765672c183038604adf9e327985a55815c732287d3595e1899d6b00629b758a2dfdc426c658927f69c0939247995ded77f
 DIST gentoo-kernel-6.1.5-1.ppc64le.gpkg.tar 62720000 BLAKE2B 1da226a56a8a2f0a49f1a597a472ed3b97e4a7a5c4b4b18922a613f01bcadf90005635c6224feb3e70b1f2543823ef99b3192ac8d53605a28736b54f63649ee0 SHA512 80755a351f65007123b3a2427d186fac8b24204c769580b810b9860f4d3531cd40b2be7006631371d4be9d959954537cd7dbf05344bc14b0d08ca4f9432a5484
 DIST gentoo-kernel-6.1.5-1.x86.gpkg.tar 65966080 BLAKE2B e7eb9f70e581f0feafb0edb6f82d6cc615c32ec8ffd3f9c735b7172e24f2ad81ed765c6c7cbdd7ea0a2916bf909108f0475b6d8b31e56fe15f49fa346a541a9c SHA512 4df6bedc4be616a4b347f1d35ba762dbe4cb489893a13ca22d0e392caf10514e4d96e60101014ae74a741eb80056e9d10be503a3cd1b46a0371e72f0da9c58c2
+DIST gentoo-kernel-6.1.6-1.amd64.gpkg.tar 76738560 BLAKE2B 24d6d3f29b4323d3ff080d05c14374f203c7086527402bdc042068e350df9ca596f0dbe07bd985c74326dde5652ca464ed093a9a0fd90ce98862dcc2dda9978e SHA512 26ed6dc543859a9b842e19e08cdd715e48143d7d3af76713fef0e18c12298432b601fbf2eda0c8fa01485492c97db37483634b694ff51cd5a00f2037867ad730
+DIST gentoo-kernel-6.1.6-1.arm64.gpkg.tar 69324800 BLAKE2B afbbd8f02b7127f95d9ca3e14e28d594716d17e472514886e83d4ac4a07e55aa6f1aa905a3328d55eab1b0857b6510ae9c5d2683a24f806136937ffa62e5fe35 SHA512 fcdd7700192661cd8b010389bef50c516f5f47e425c2122b3b2718a815c209ba5c64c54cc88c94dabe0968d65f5f52e8ebaca887ca1b3f741938dae8a384ebc5
+DIST gentoo-kernel-6.1.6-1.ppc64le.gpkg.tar 62730240 BLAKE2B 3a94df5fa51cb826a8501f12dc47deb77ea124ab59272bcb2d4506a137ffb26ef3f0c75d6efa10d08aece61064318642bf40257a7e3fef3766234725ec16e5c8 SHA512 24c267ff67fd980913ac7f7b494224ef46b0d102537ad89ba1a0e08f388a95fe9b4b817a0e9270a187c24d42d7b41f96a2c906079f9c06fb4fbbd8c5dab140f8
+DIST gentoo-kernel-6.1.6-1.x86.gpkg.tar 65976320 BLAKE2B f1eb2845fc24c35e5f922dd34181d732317ed8adb853816118c85baa8ff315a9d219b4296062341386c3bc283ac119e05753d3d723d92c206b527d34bb1dd6ba SHA512 4f59cf63d90fc8ad3d1bfa846a51e8218c52109de138e5b24ce91d6eb27c82e3e2f9417e74990e48571dc559639edf8ff5d742d5b4d67d31a804447cba184c53
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
@@ -101,9 +119,11 @@ DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 EBUILD gentoo-kernel-bin-5.10.161-r1.ebuild 3022 BLAKE2B 6f21255ea312415373259e8272f59a2fab017b33d28a1ef86113acdc6778f2974273b63af219ed1003a0c2123fea99fb6c9a09625f9d00704339c2daf5fa836b SHA512 faa03d4a455bdb04c4e24ac62a5656a3411df53e83e6ebd4e4e8a02b9684e915582183184e3cb23029afa5f620d1dee5d3526ce06a215ddf10169cdb12b5769b
 EBUILD gentoo-kernel-bin-5.10.162.ebuild 3028 BLAKE2B f09e5f0570fd0166abc54b10b93433d1068d4f3a4713cfb6857697532f30b6e2a1df8d4afd66eaa665f4bd2023205334900392f020c62b0574c87a119479bc1a SHA512 e6a6510263e9cf194b9336e26cade4b76f190e1765b7000be003203f4e23fd2b2d64b645e37c0c69a35ba93c3a2e9c5e6f6b9d14eedc1b506b3b68debcf95911
+EBUILD gentoo-kernel-bin-5.10.163.ebuild 3028 BLAKE2B f09e5f0570fd0166abc54b10b93433d1068d4f3a4713cfb6857697532f30b6e2a1df8d4afd66eaa665f4bd2023205334900392f020c62b0574c87a119479bc1a SHA512 e6a6510263e9cf194b9336e26cade4b76f190e1765b7000be003203f4e23fd2b2d64b645e37c0c69a35ba93c3a2e9c5e6f6b9d14eedc1b506b3b68debcf95911
 EBUILD gentoo-kernel-bin-5.15.85-r1.ebuild 3022 BLAKE2B c2c44ef090e52703cf827e2e2b8416b2113bbfc487ec5b2b2d69056f9b18b256cbd17db766f4b3f14b3c40df8774404bea85f3e4d456afe3c3bd0484669ebbe1 SHA512 83fe8dff3b569a37e59aeb3b5e496298f61017ce6fd5efef54d1942ea3fc0f6bf14052b67bd8b6e64537242c497e808c035126db2d20c947051c86ec9787c7cb
 EBUILD gentoo-kernel-bin-5.15.86.ebuild 3028 BLAKE2B 27b19fb47bbb60d614d6e70734ba1eb4179ebd5136adb26534b528ac70f31d7f1e867ddeee94aedf437a6b920f8a2be5edf3fec909117a8d31e5cc9146850ce9 SHA512 c6c6e5842419638d1670e3a482de3bfc2bc35452441f2ac7abb3b0e3e4432aa767b612c3078470a98da5963c09615f6f9986c20dd9a1d18abba4fdf7d7ad6815
 EBUILD gentoo-kernel-bin-5.15.87.ebuild 3028 BLAKE2B c8314539c6ea447c8645bc304bfcf6cfa99398ad38f6106dc2fa6c9a9a759ccd288646b95f77a2e9a3e9ec2ab045ffd1544a70d9060096a0e04a91ecff46ad42 SHA512 22fbd6a7597f0a6b489e6e6cace828fa7df95cbffe48a6c79b7a4d568c2e79f7ffa7d8bc717fa2746015b0e4da295f446c6d7f20bc679fadf7d9ee6574921e2d
+EBUILD gentoo-kernel-bin-5.15.88.ebuild 3028 BLAKE2B c8314539c6ea447c8645bc304bfcf6cfa99398ad38f6106dc2fa6c9a9a759ccd288646b95f77a2e9a3e9ec2ab045ffd1544a70d9060096a0e04a91ecff46ad42 SHA512 22fbd6a7597f0a6b489e6e6cace828fa7df95cbffe48a6c79b7a4d568c2e79f7ffa7d8bc717fa2746015b0e4da295f446c6d7f20bc679fadf7d9ee6574921e2d
 EBUILD gentoo-kernel-bin-5.4.228-r1.ebuild 3022 BLAKE2B 253a58bd91ca83ca4e0317b6a746ac8e9277a0d6329139a1c263df53f026c013e1ecbfcfdcef1c90823ef24e591d9f707c9b6fc55974a7c73c5d74d70bb39fa2 SHA512 367bc272dfcf9f1c8e72d1256e86b80f21ed0405395bf992b3e15ce73b56ad251282074480724de522d572dc125ed86953f75d3a61198c1b9fcfa567d6621bad
 EBUILD gentoo-kernel-bin-6.0.15-r1.ebuild 3026 BLAKE2B d6545c6097f7bf334eab6ead5862b3b78c100b8d7df2da40378fd23aafeb09fdc904109b8f57a935712176a698b070cda01c25f9aefe31466be05911b82420ea SHA512 aab580d1b63953709cd9319c25c0adaafc96d0264f79afaeb0d1e34997138b9e51aa85d0fa378182e004ef22850270b0c69a7da00b95e5c3595f7b5d249ed16c
 EBUILD gentoo-kernel-bin-6.0.16.ebuild 3028 BLAKE2B 1efd8a8fecc5d89c5b783ffccb54a6285966c6d17a896d8abfd2f91c4a74ec42af4251f2c87e890cce842c7bd18d754a5e9e632b1c2ee107c3a13be840de7311 SHA512 838a9d5a2ee1ebbbee4824ab5e2fa5cf3397097346e544622e647886bb9ea19f38086d6d965ebe9eb38c9e77fbc629ba91a25f103bdd851da01471470f3a7504
@@ -115,4 +135,5 @@ EBUILD gentoo-kernel-bin-6.1.2.ebuild 3028 BLAKE2B b1d469abe77572298742c141b60a3
 EBUILD gentoo-kernel-bin-6.1.3.ebuild 3028 BLAKE2B 4bb3f46f40739c0304029ff6c4ccfdf255a4a8e247bef77c76e7d8bb57458e35ac2b2dddd1ebddbc189b1ce6402b97481c1e71e53337795b95de6700b1c1c1a7 SHA512 2bc1fd4438671d444003d3447618ae56c0efda7b2d82df6961cf48776d5c69ba39f4ffa83e6c0a818d7418291049cbf282a41d8c35de8fd7beff6c935c322bd6
 EBUILD gentoo-kernel-bin-6.1.4.ebuild 3028 BLAKE2B 4bb3f46f40739c0304029ff6c4ccfdf255a4a8e247bef77c76e7d8bb57458e35ac2b2dddd1ebddbc189b1ce6402b97481c1e71e53337795b95de6700b1c1c1a7 SHA512 2bc1fd4438671d444003d3447618ae56c0efda7b2d82df6961cf48776d5c69ba39f4ffa83e6c0a818d7418291049cbf282a41d8c35de8fd7beff6c935c322bd6
 EBUILD gentoo-kernel-bin-6.1.5.ebuild 3028 BLAKE2B f1a8609dc0df691418f250273a84d7d645ed2c84f3ec70d4bdf494938b2305053949c31dc1ca1020d602de2ecc66a5bf0a231205ecd5c1fc500d80577cab7071 SHA512 c01314ba4cdad6a38de547bf178cd75d2c3cd5b8ee732bf60facda3d1ebdfef371fc1bea1603111fc96e36426996ff247150751f6a23f67dc1eaa688910f2f56
+EBUILD gentoo-kernel-bin-6.1.6.ebuild 3028 BLAKE2B f1a8609dc0df691418f250273a84d7d645ed2c84f3ec70d4bdf494938b2305053949c31dc1ca1020d602de2ecc66a5bf0a231205ecd5c1fc500d80577cab7071 SHA512 c01314ba4cdad6a38de547bf178cd75d2c3cd5b8ee732bf60facda3d1ebdfef371fc1bea1603111fc96e36426996ff247150751f6a23f67dc1eaa688910f2f56
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.163.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.163.ebuild
new file mode 100644
index 000000000000..8f6c357c55e5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.163.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.88.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.88.ebuild
new file mode 100644
index 000000000000..27016e1b991a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.88.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.6.ebuild
new file mode 100644
index 000000000000..ed76d510db0b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.6.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 599a9dfdfd63..064ec37e1c78 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,12 +2,16 @@ DIST genpatches-5.10-170.base.tar.xz 4506932 BLAKE2B 9503a369d1d653fc08e0c244389
 DIST genpatches-5.10-170.extras.tar.xz 3868 BLAKE2B fcba4ddac271a957a8f2645fc833338bd2da71ded4cb935bf1f2df267f50fdf1bab0e2bb0967a3cae975bc7cfaeae932261ae0aab4bcad40b32546ff69850c41 SHA512 bb272928563d33ddf9a90db610ed013f625121f8a05cf497c14dfb74052300cae361474e71203be35949ace7aa9bdc23e98f2dedfe3eef885a59674a90166c6e
 DIST genpatches-5.10-171.base.tar.xz 4617172 BLAKE2B 7ab9b6676f808124a6e2996bd3ad36b1e76228ac969f16ad3956b50b31e8f5f12f3f4588afc88df42b157bd6847474e8cb1e1317e863ea63da94503ee0b73e18 SHA512 5243ffe0b9c79e75f1649f3deafd6293cb016475459e51fc4f298513245d974803a5d802c1670022840d1c087daa55e5d1133caa5e5b49b39d1aa1e7604e897b
 DIST genpatches-5.10-171.extras.tar.xz 3872 BLAKE2B 27eff9d6f83ae27c147de7910f5d8e1c43f286f3f3da6cb56caa048c2c226c28926a32fc40b47cb0dae39347754fd65e1f26ef9c350065cd7db62ee5935372e5 SHA512 bc82b100c55bd0c935363c10dc87607a8aa2539401ea6a1c6618d37deae072b390cb33e3075a4dab3583d52c7f0a79e30f2dfc8b0a6eb5fcf5f59d8a01020ede
+DIST genpatches-5.10-172.base.tar.xz 4831748 BLAKE2B 46acfe58044df90c98057fc25903c1af1ff3baccace354659b79b939ca6b2054488c8823c456620880e4af9221e0d26eadfd355aaccf4679989ce2e6077507e5 SHA512 8951a10959454b515269be97e163e73aa7cc8374abc7d0fa73243f67944bd1592051736ec06e2ce29ee01d4e0b79ec783d30b40664105f12aad24c9c4cff0a33
+DIST genpatches-5.10-172.extras.tar.xz 3868 BLAKE2B 32ee2c036c224c800ce53fa94d8f6676c70023bb733cef143355ed5907a4815cb252bc43d1660bedd841dffc814c15a9016d8c0d43b80ece58c9f4bf77c472eb SHA512 10372d1ab1d8bd73dc1c7412498cfb5ce91dc74d5e40c6497aeac24fb71d9c007d03cdbe58b2b7d6304af11816a4981cfc4bdefcd39da19009cb2f0bef9ba5ea
 DIST genpatches-5.15-89.base.tar.xz 3552056 BLAKE2B 2131869a216e9e99fe893e502e9dff10ef486fcbd0a130db2621ecbc61194d4f224745d146213edf35083752de89624346eb7fcd7c2fb53f414d3ddc200b5b51 SHA512 ac840d8ea832f5a388ace30cc435501112992a16834dfd01bef764683b415405b1f9fa644062c8ca3ecb18739e55133f2282281436847d9ceae8fd6104dc583e
 DIST genpatches-5.15-89.extras.tar.xz 3932 BLAKE2B 25a5b47eed2412b6d660572c266fd8d22be0c3e570dab6d45a7e6a0015227a1b4cd468582bebe3ebc7f47600d3ad30a5853dc2398e39ae02352a1b5df1faea36 SHA512 b4ce39a33610e5ff1c3309f787dddca702e55d81b19dbfb9300386a246e758ca9192eb98189ed01ba138d38947fa35e27dc6d3b459da059807bee93289845879
 DIST genpatches-5.15-90.base.tar.xz 3757428 BLAKE2B 30e129e5362a5fd690d8273a36e102510e113415e3241f838b366c2e35dbf1b95fa30d6e34e6e36c5d938855aefcc66a039f1242ea8a69263fdbaf84c46434c4 SHA512 bca6d1252657ad611a71ed2ea128887b131f9dad83f4c0007573b2637fd79b117023d0ade5b833070a8c86ab4f698d0b3250e01b612a0b65515a164fdc9d1212
 DIST genpatches-5.15-90.extras.tar.xz 3932 BLAKE2B e84edd591a94f2d21593f86aa7ed2a27980e099b388f49e899655dd687d459be87491c6441b73a5c024c43bb81f74103ef226d3bc3ae42d089749db0b06ccf45 SHA512 687240f034abd1e91d85e057bae2693129ef6fc4b6119c71df00c306ae2d1cc64ea294a76ce8017b7f2b0ac557c41b9ac70d4fb466ca2899a3c544490421df45
 DIST genpatches-5.15-91.base.tar.xz 3838856 BLAKE2B e42746d0b7342cd6e2ab1b6b907a202277365a4fe52df5eae5d3685c68efbcbce58ab1c6d00e0b89c1f581f6818ba830f35af96d40e1bbf80ac824b0be572715 SHA512 37b31c9f878dc1cc4c5446fe7810b6fb9caf556296e99975de1e37bde9e798f5f74e90cd6d825ae1f474bbd8ae31da3f07e5527d3ce6aff42761ce8425634949
 DIST genpatches-5.15-91.extras.tar.xz 3932 BLAKE2B 139a9a7876504ce63abf76db63904b3b4330ab101ec7f0c97717ee83ff861595df31a36f5fe4fbaf3b70641e6029e399235a7ec3e26feb98522c57e6b4b5d71b SHA512 9486f83b99c1f0bcd23e556229c7c0947be4fa097d688b510b6d57d94584e6fffcc9a2412c3620ceeffc2b347fad1ea1e12f58b2f0629cf93a2bde19f567ee5d
+DIST genpatches-5.15-92.base.tar.xz 3843196 BLAKE2B 1a70c672f4ceda221611ba1bad20fc4e791a51e27f412995308cb7f39962c6e237efc1bb7912c67b8e3dabaffce3bb6ceb55d62f4f12b79671910b70c1e7a8dd SHA512 33390b3e24783405971f2eacb24e715faf841a66e477a03d4055d61694fa72694d7563d799b95d47037ad0d7e7c234e56c894ddd7cd1dba59077efb901bbba26
+DIST genpatches-5.15-92.extras.tar.xz 3932 BLAKE2B 12936d0ac139d69f2e5947436ffd34add80625aa383aa23e51b4419a5e2ad3c38ace4d69c9e7066bfeae32ab727013e602c3a1c3424e128562597c517c7e5903 SHA512 6595eca7525db97672a15275228dbb9b14e7e234514b549e0fc17daeda4b48d298f6dbcde46e5862fe02bac9f50ffd7b05d82a174541469456289bdc6eb7f4b1
 DIST genpatches-5.4-233.base.tar.xz 5294692 BLAKE2B 357046687c6f2797d5d7090dad357e00675eed329ccef44223dd476551cf04e9f711f1020144cfc59796657cb5b1e6d76b607ecb164e27636869a8bc8984f567 SHA512 45f6b35dbca12e8b9e6a9f99d12c44e47a6e471e5091ab75c42346f1d8bc12dc454cbb335f1549b497842c2d9f13a5930c80b5000cb86bd3db7b03347dfebcf4
 DIST genpatches-5.4-233.extras.tar.xz 1812 BLAKE2B abedf631da893391a98a98cf48d264f9eaf9f9f7811bf595c36a774c8dde21f105afaf6f4e113e04de472bd6ce0c759bd41fd95aa980b7e05499d8571f3e8a44 SHA512 16b09d0a4465123079360ef9f070e0c163f45f9784714e98fe53f7174e836fe7b2562af01e5c2dc932571bb3eafe2d9afedfd60b5c8467bd8410de651ab82473
 DIST genpatches-6.0-15.base.tar.xz 709204 BLAKE2B cba74ce5f9a6d8a00991f87fe33771f615640c8c3adaee94432580f5df51cb2a488794a376c9355d568ab4b3014fe23e4c9fb000bb9ed6948b4225211df862d6 SHA512 64d5d04b8c1b3c3967fd22cfd975b7f9bbf37e7d7d4e966c7017b589837cfa02200a80880f13ac52942fd845c9835143d809817f5517c91992e30e101b15c775
@@ -30,6 +34,8 @@ DIST genpatches-6.1-5.base.tar.xz 416352 BLAKE2B c3aedee62099a942b85016df0493ca1
 DIST genpatches-6.1-5.extras.tar.xz 3804 BLAKE2B ef944c72d659c38fcf1d279693fa3c1a7e2aeca6fa5d706699dd3f862247d0f0ffa2522a326aa896b57eac985417d04ddb652a260a96924b97c6dbf9ae940562 SHA512 e7461ef3c47af3b6c4e9861a95dacd56b71bef7a518b69abc0ff94b40fb3beae0d3fc04a16ff80332cebcfd16eff0ffd334e02377d7e15bb1a824f51ee143173
 DIST genpatches-6.1-7.base.tar.xz 470576 BLAKE2B 09a0d003fb9d121c51423d05729a9a72b27d5eb57e0e671d454cf14a8a72a1109a5d869ea25792602e3f7a53008d3ff7b568389b16400ff7bd04c9c1ee311a59 SHA512 80db2cdacffa2ac85830ebef934c33345dc113f5ccae252ad18201d322b7b4ad4bee5826e077cba4029f97e871fc16ce22fcd994d58cb787c71c746088cccc34
 DIST genpatches-6.1-7.extras.tar.xz 3808 BLAKE2B 1640a94b258538c462e74f566b290e18a6c88a1993aad96e9442b40c498d8a8dd33b634816f53cd6ac39a1e95d9b0f9462d345970c706e3424ec6be8ff99d902 SHA512 e843e33fb1fefd0f3e0e426132ecf56dcc9702cca1d57cde74e4b43d414acc01e0334b3b1bf767391c2d1bbc4499d5e73508778b47ec849b256569392d77f84f
+DIST genpatches-6.1-8.base.tar.xz 477364 BLAKE2B 29fa8d45feed6333883e1f4733ace6ed52b5424aeeada3e71917a0e3d85f87a7b99f0863ff468e678ee5631c6e0f0dd7c3a0115a58d80512ac1a27d58a2df149 SHA512 d1f32215ced0ed39cc1c6d224b1a12ae3f80bcc19f1ea23189e853367ebc661c74d17d335bd615c2fc1f3c21271f6f170a35caa38194b2dfd09f78e405739ae0
+DIST genpatches-6.1-8.extras.tar.xz 3808 BLAKE2B af83b01895f1b3af4c0220a89b0dabc3642e578920475402c02dbe0300c520dbc621a2245eb66842addac48565c8b612198138c49491dca7909d594a9d2ef818 SHA512 22f9378bc7b4413d60672656c2e73bfbcc6debd10179a0eb2b523bceb5f3adeacecbd433ede3aa057143163a9cc2971d5023d73ac8187eaad59508dd229feba7
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 00edc4b5dc943834bc7ee977382b2960160888db00a25c5a7f73968784aa39a2b3b69f0bbda89b3ce8eb55e746006cff2839481493ac8bfca6a21de2299564f7 SHA512 44beae869bebf5445655dafe1facc47c3dbe602b34c5bf2fa984a581bfe3250fa0df908b8807c333c2e66ab9d1a2bb8026e22140f2a1f522d0dd647c96ca4d5e
 DIST gentoo-kernel-config-g4.tar.gz 4459 BLAKE2B 8a481315e427c2da5d14847bfa00e7904aec8cbe6dddde504bc4ce016a19b8c9f67d09dd1bc2f6feea22368b91555a74a045ae1d0f9aa1395616f008e74dbdc5 SHA512 c4b1d3a67cf614f0f9c0af4adaa23d97c0e91b467a1e69f88a0994760c187bfb403fffc0a5fdeb09f9fc4af849013f7f993cd55a8a4a82ba32309475f09deef5
@@ -65,9 +71,11 @@ DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 EBUILD gentoo-kernel-5.10.161.ebuild 3596 BLAKE2B 862e8da83e0e335ac202ea0d0d4107062b203ed4d6e1f438a8cb860649dba325082935cea6f4d08f92648cd206d67f13600ed24f7849f10dbadd1457a2f69ccc SHA512 b7d09fe2b0b1a46916bbd61f613e1da08ad7a12f48e0c0b408850224e58c07382e23cd964d31f33a89541a56be4a21543fecc86cca065dca0f60f21235a6b90f
 EBUILD gentoo-kernel-5.10.162.ebuild 3602 BLAKE2B 459521aac4185ff8b5b26dce3aa62379c286d311553b4f77d5057fc7d869ec7e0c50df0e396780560dd21b57154db15b26635ed61b113b74b385a1816377c245 SHA512 a4ab5da22f2c2aa78c805a1d4cba5a7de53d22c247a0b0c603c2885e42241a365c6a611669ac57a2315fe17058b4e07473cfc3d43661bd021f8c6ceda570c693
+EBUILD gentoo-kernel-5.10.163.ebuild 3602 BLAKE2B 660624358ac35a6a9caeea29406af4bc093d13054a6ddf5cf7be868b3cb32f5bd27e30ef3d5b4a1b5d19ac06c85e34fd43ab3f9509e3bd486dc70d398f3cc154 SHA512 38d738d5ac3ba627541b665e442077a20aeda89f7656505435a3e21c275c25fd3b004c2266407c0cbe52799a400f4ec083923d28c0c33f2e84e13734fcd3017d
 EBUILD gentoo-kernel-5.15.85.ebuild 3593 BLAKE2B ca333666fe35d2df100f147f640f88ac514169bf66560f5f13640de7415899756eb7ed172a577742dde903ec1530788411fbdade882eb495a3f83dbbc61a6bf2 SHA512 12d96643b5e0f1b99535fc4de43475b85ce7533d0034bf12df653e49570262ba9df8cb82ff71ac4b99ad927e0dd1c3ab408319f25bc194313cc766f7ce6bf6b5
 EBUILD gentoo-kernel-5.15.86.ebuild 3599 BLAKE2B ce2f332e14d6420a0ce635a8f1ea29788e46f385b7aef0fd7f86b2358c66574ea9e713927df98ae3e95b37ef0cf321cc4325bd1e8ad3a0da128d8942097286c9 SHA512 bc805c80743ad1ce74a09910c234e3ceddd6ff333eafc0babc7ff9ac7ba44ddc09d2c9e108a74b3223e6677eb77f91fe832b58f25e82a204a4adf8cc85517dec
 EBUILD gentoo-kernel-5.15.87.ebuild 3599 BLAKE2B d46271e5a7f13133b586dc6d386fbe809803f149bcc6b89827db8dfd46ef02ac386cd9301165787454127c41e5b003d5754bf59683afa7c9e89c7d79271192b5 SHA512 9b19c0923e459d55a2808bb0ee0af5b21b14a119538149cde61120bbaf9e3b65166e8ec65fb37d48025fbcac8c96b106e1e7b09ea1a8024f5cdd64a96f8f0577
+EBUILD gentoo-kernel-5.15.88.ebuild 3599 BLAKE2B d46271e5a7f13133b586dc6d386fbe809803f149bcc6b89827db8dfd46ef02ac386cd9301165787454127c41e5b003d5754bf59683afa7c9e89c7d79271192b5 SHA512 9b19c0923e459d55a2808bb0ee0af5b21b14a119538149cde61120bbaf9e3b65166e8ec65fb37d48025fbcac8c96b106e1e7b09ea1a8024f5cdd64a96f8f0577
 EBUILD gentoo-kernel-5.4.228.ebuild 2797 BLAKE2B bf6bb6f68e1a7458389c1a488dea8c8b5528eeacbfcba30371278eaa40961aa74fffeba292d8ee806e8c8f6057f2debc61010e3b32cbcfddfd515d8dc68da8ef SHA512 e1674ab6bd781577b805e1494dbeb43fc6b36c36e7605ba172f4324330488e7c6e81c6dac8080ba54f1b17705d02e23e895f3e34e2ca5d69b89d5b440906445e
 EBUILD gentoo-kernel-6.0.15.ebuild 3856 BLAKE2B 48a2e0b820e22cf8e12dd4b4b7ebb454c414f5077c6f9d5df417dacd915309ebb88becb225abd84fd2141e8b72435ad8411b1bb4766a97727073345abf94e860 SHA512 05e23e285445816dd8e23d5879f6a51e5640af55fac1d38129ac6dcad290b96b179fadc8e87a170d8c2a54969ec3ce05544607048a579604aa0d74b4589f93da
 EBUILD gentoo-kernel-6.0.16.ebuild 3858 BLAKE2B 6431c930908b4ee1ac63c6a792a9f227122ca5822d4cfa76825c6b2b0ce2e22daabf3e29d885ab5cc0cd8cd56f49df82fe20fcb0bd38ca274ddcedadf5420db5 SHA512 edda364adf40995b1ba2ac3b158aba4216e859ec1d09ed0d593092d3d4986f06ee3bd3f13356a0397ce0bef555b494e6202bed857f3be03d65039e330f3e6277
@@ -79,4 +87,5 @@ EBUILD gentoo-kernel-6.1.2.ebuild 3858 BLAKE2B 6677b42cca4a9bac82aa3a79b1941a030
 EBUILD gentoo-kernel-6.1.3.ebuild 3858 BLAKE2B 63d21385de7511c8e4a58104dfb5c50a0be41f394646f2d27e1a777ad3f3900281c42c479c937afd49e06b06100e74a282b5dc8d2b164b8772e3e5b656bd575b SHA512 4461d3423e0b4b9c30eb3442c16562557017f1d1dba6c090719f34dd9297fe1841e9405dbe327eddcb1b008269e2d0485ed6dbb8af47201f409eacaebdb72762
 EBUILD gentoo-kernel-6.1.4.ebuild 3858 BLAKE2B d91f7156ce98a26392ec6df1ea85bc09900b6d52bc31d3a72b55cb96b3384be437bccb8ddf828570c0144470202e821142df8238014b9f7e7fbd2dead699a911 SHA512 e057c29925a106414a521bc879975821ede5dfa78cf05fc32094858aa4fdc7c5a11abda5f6c228773da11d34c0d41833d5fcea6f3f16ecfecdc1fcceb7979e1a
 EBUILD gentoo-kernel-6.1.5.ebuild 3858 BLAKE2B a21f1ffd668d8ecbcde8b7d240de6e881779b50a2c85360ff32c8b76786b491f2dce9c52aa245c832c0b4e8b1621288952f821cc4777bde6068b977e56159c4d SHA512 7cc0e69f210cc9d1112959af8bbd47ce47cf85fe292dd705cb54c938348aeb0831204d76b87820057e39dcda115190a80c6d23c79e9605dab36dd53d827063ca
+EBUILD gentoo-kernel-6.1.6.ebuild 3858 BLAKE2B a21f1ffd668d8ecbcde8b7d240de6e881779b50a2c85360ff32c8b76786b491f2dce9c52aa245c832c0b4e8b1621288952f821cc4777bde6068b977e56159c4d SHA512 7cc0e69f210cc9d1112959af8bbd47ce47cf85fe292dd705cb54c938348aeb0831204d76b87820057e39dcda115190a80c6d23c79e9605dab36dd53d827063ca
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.163.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.163.ebuild
new file mode 100644
index 000000000000..91681171e16c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.163.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g5
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.88.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.88.ebuild
new file mode 100644
index 000000000000..635cf489ceca
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.88.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g5
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.6.ebuild
new file mode 100644
index 000000000000..3072f5949bd6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.6.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.2-gentoo
+GENTOO_CONFIG_VER=g5
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index a255b29739cd..024848ea6368 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -34,12 +34,16 @@ DIST linux-5.10.161.tar.sign 993 BLAKE2B 9237c5037a39e92c2eca9b2c16de865ca5ad115
 DIST linux-5.10.161.tar.xz 120516432 BLAKE2B b35e08b3ed843fe0d0ea2a08728f192ab795b61438a60c148097c8bc00c1bdc9b6bca925bf4e3cd124ac3c5d50920f2bf1a481c24a97b8787c012e3df993d8bb SHA512 aad3c70cc6eef39623ba038e74fc5435764ab81cf8782d44ab07c50f50c66f303d1cd49b439aee46193caaa43f4c322924691ea5e3ac2b01142420efe11700d5
 DIST linux-5.10.162.tar.sign 993 BLAKE2B dbf8a63c4035e3085b59d13c5e0763d0e3884798a59c69c627d00a15813db8bf4fc84b4952a68d0c2230d3e5bfacf6407f8915c13bf5bdb69c98a8ed1d93f27d SHA512 329319be28334b3ad351394e6f3e6e6f93530511ec52b53012d8abee2bc1d9e7f043f277d9b3a9c9b4bd0abce69c05167b45cb58b6dfb6ee96367fbb5eec7a67
 DIST linux-5.10.162.tar.xz 120528796 BLAKE2B c06f95f9232cae822f390e7d443eae46fc5e4b5625397f0de64d8ed3a6fae68fcebdb855b0aa6e55829d920f94f3b602e165634b59da637ef92a804f6317bfb6 SHA512 941c7ddd7c27f49b4491e1c8fbf1efedcbac50b48ed8836ec91091ead69723f820a61bfda795378dcc728a782d2206189903333e83e255b723eec01157bbb0bb
+DIST linux-5.10.163.tar.sign 993 BLAKE2B e085bd8633c659a431f1d6cf070761238e2cd52b63421be67870009afbb90316cdf5ad6c58cce17614cb0a06f067f5daf22d864aa00bd9940b59deba0b31a294 SHA512 6e6d962157828fddbae6c98d00c27d22efb3a2cfbb45d3dccc86ca1a73e6d70f80e5a58f92469e18a5448237e40b77c995623deff88fc328ff333d48fa91dbac
+DIST linux-5.10.163.tar.xz 120553276 BLAKE2B a9806d2fcc28783976a78d5f1fb4d10f1523f0fce35c5bb04485cf54db843b505350be3dbd31bba2b528289bfc97cd2719b54756512409fd03a158f37cc1940b SHA512 8c405ccc8e0ab1748058d7e135ccde5501500d535fb8c2023c4c6a399be8957e5d6f9398ff30769078bc8699509db333f158f79fb8a6e7b816aa1ec413ba8ea1
 DIST linux-5.15.85.tar.sign 991 BLAKE2B dc06c346781a947993743eeb08784d35091b64c2f6d617f05e6b8eb6143887362d34a8f5e819be24cb423ee0d4e92dc040246d6f979d9ddecbf79fea439b0bf7 SHA512 c2d734b5bf0f4b5b568d5c9217bddbff319c727d3489afb8eba64f67b225d34ce8de079e2e8c4210c4096097c28cac255c9187b0267dac9b842806ce71a47220
 DIST linux-5.15.85.tar.xz 126501228 BLAKE2B 481cea334dee4146d72704ecb88f654bd38ca62a5a28540f365a57f5cd522551c4b7f854c09380ec614098a9efa5dff4cef70c9cafe6277a410d3d2099eca1cc SHA512 8cc19124c82f14e09b5ff8d2e343cd41cdfced74e5c0c501abd258555d9dbaa79e79cb23256a474cd59311ae8626b0457c2117263bd64a206151c09b54f3ff46
 DIST linux-5.15.86.tar.sign 991 BLAKE2B 18dd86da143bb3e3afa28e9de2778ed384d44988857968ff6e7eca13029cfdcdddc9f707d7df1f37751b321be216b94b91fbab985ad09d2f487698f83e1f4107 SHA512 e3f6e14db0edbc41d3d9cd4e2c296eb8cf7e678daf71567aa7a814bf9541f610a1f91996b93104e7d9c35d1b079b9f9b1e14be2e30b5fbaaf587c5ef69555911
 DIST linux-5.15.86.tar.xz 126498884 BLAKE2B 6d088a5abcc1a8c56c2fdf05932f757ad5bbca48f5e60f5a302b2513186b7519af44daeebcb2ac96bd30967c58967426a3b33f492b22b5db7d75d3bd81411eb4 SHA512 5acbf5e7ff56484b8a4eda3f7e1662029eb2bc7621082386887ba893bef172da49512f1a6e05c590c32e591c3d8b1a41c6a11fc1befe5196f28e60c9f0a7b22f
 DIST linux-5.15.87.tar.sign 991 BLAKE2B c1151b495ac95643e4508424a7ca7e0b845d0a7dd5b8a1c0059698450905461203128909c0b06f65dfaf5bc40b16150c12c8543631c35d452ff5875c048d8f25 SHA512 958080d6e5508c91e1131005f3d004d54f95c3b9f1ace941721f149ffed3ecd8974c1a15b3ed191f904bdefde33c0f5bb13f697261dfa48f61d1a0b6fa18411d
 DIST linux-5.15.87.tar.xz 126508400 BLAKE2B 3a98b315a0734500971de4a6d1e5d9e66ea7a5ec84db54fc5f84a89d00b071deaf29a4d4ceae46da71db566d5539d0ed7037d0038f4fbd3c59f18416bc004b4b SHA512 f5e9d5eb2555c6a879ff11d30d355da18e91693b9eb7c42249f30da170a568b9d3878cf83ed0a25b1210f20fba907539653a8101872a111438f7cc7df6f70f7e
+DIST linux-5.15.88.tar.sign 991 BLAKE2B 928ea938758c904971cde08ea5d390ee483eda4ad5c7ced83d606e219d823966bd6ea745c64b2c954e81d444369507d57cfa3b54e18e433d9733325007fca93e SHA512 b9f1744190bdcb220d8a17b295784aa34ca0ab7035d4fc832dab0605ce665dcc9ac356ceefdf47a2996dfd33b05b0ec8a2dcd66c785146c756cca74ad10ad0a2
+DIST linux-5.15.88.tar.xz 126523892 BLAKE2B 26ec7427e3370c417a048ca76f394cd9aeb25f6cf8b6bbceb074707a85c75f668c8d70c9f1b19cd05ce33212f259736ac1b554793ead30a007d1745d4329879c SHA512 2ecb84f7800a6fe22577f890c403e2bad383a1638b6a176c20cd8d1311ea433c016e08ef00d1441099c1dba974d82c4211acc190c8d59aaa9feb12588af1b348
 DIST linux-5.4.228.tar.sign 991 BLAKE2B 4edd63de96c2cceeedf8b20ab4696fb4c8b8e45916d95ea9279de4911874e4537aa8f8acc4014545746d4546bce66843a3e56d56c90592e730e4ae1165c1486d SHA512 72be75fbf5704706d6d772a50646550e3d54458044e5fe5a49afa7dd98360f30b0a4e345744e691b09d8951712d1d766d050846fa7ce13bbf4f1e9dd26063d4d
 DIST linux-5.4.228.tar.xz 112978736 BLAKE2B ade9b21e3f434435230e31d67d39ea07d15d92cdf932b3b181fc532669f10ebd2f0eb7d5fb20ae9eae93c782f10db5ab3454bb13c01694f674f83146bcae8187 SHA512 f3fa33da1df3dd10ba9536d30b8aebf92796abe84872c402776c94b35bf3efb4256a6c3f0267bd97741db9853352d1b22bcb42d7d03f167960804bb9f7407601
 DIST linux-6.0.15.tar.sign 989 BLAKE2B 214ba7092718635f5dd39f2374615854c276e450ee81b8811b2e5a9dcff300eb38c4acbda4ebc1dcc0d7a2866e4a6bea8c2e5280309428164df8294bc616f8b3 SHA512 f39bebbb1d60ab7457e861ac7005a5cb975cb53519d777ff66119d2ca087f9a654cf1f11ecb4f7b58af6da574c698dccc69c9daa99ded277da178593c5fdaf76
@@ -62,12 +66,16 @@ DIST linux-6.1.4.tar.sign 987 BLAKE2B 3a2607dde89f6b07187dba936720a128722959361c
 DIST linux-6.1.4.tar.xz 134741224 BLAKE2B 4222225ad841f96df6fdda38e64934012dc6712f7c751c8de735163831bd3605ee107ecf82b1046590f5dd0c66459923aff7c23d5181a45ae7556ac419255740 SHA512 9f75756a88e1b07a0970a59d71d03683886e782cfa472b6d2422753842929d3e964238d54cbd2df9b2779b206f8b7a676a2287a607da95300a73b0846da19fd8
 DIST linux-6.1.5.tar.sign 987 BLAKE2B 4d72a0c3a13e1a2c4fa826e0c2120abe7ed0155d6eca2eeeeb006f9e00f0a15bdf25661ff5e7db5a31ba4583d0d3b6f3c257dc0af768849ceb75e696173777dd SHA512 c98d25c1ef7b20175f7ca8b7fa8a0e1108b9e1eafbc4b51b3195d7888282177e8b4acdb01b8b6094917cd08f1d32098519785d56d848e2c299f753b80a30c58b
 DIST linux-6.1.5.tar.xz 134771916 BLAKE2B b3e47f1184171febcd563285b82682e15fff8d932c8f897157e528e1195ca926153659be2defaf3fe294999625757f6efd02b0a786536b7e7c695721be7144aa SHA512 f359a8ff3d2d4f1e95bd90431209fa17b7b37029a246b4fbadd618afb734f2e0385a21ebdc21c9fe6b5cc84876b34a59d7ae582c97c34cf29238231db4161275
+DIST linux-6.1.6.tar.sign 987 BLAKE2B 3d47959aff69520879ce9f2d63b2e9f3d8c0f33c9a5e9caa98902df1d37115e87627470680250f256f80aaf3a3152d11b42658e0c89ead28ef1b88df2aa77b8d SHA512 8b31481f4e8034f453129f98d8caadedfd771d7a9ba23c2e41c2f932261263183ddf78ceafea3f38c14f441c2c857caad0ab98056da510d78a21d2fc35774ba7
+DIST linux-6.1.6.tar.xz 134782796 BLAKE2B 47fdcc432bd473b3948bc4b618caa329887026b86029dfad055a9d4dd5cccfdd86df48bed7dec7f9f1a037cf955e9c024f368600b5ee8bbb0a46e4620abbde10 SHA512 b162ef2033485796fcdef5613c3a11aa7fb23faa590a1d5391e29af4526dbbad49554d7a7d94f5c5bd7cb9f25b8f73e898684b4bbe9a1e45fc181e7d0fd3e0b2
 EBUILD vanilla-kernel-5.10.161.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7617ee5c663b367b096292bd58e9b66905d1d40a8325714668ba3e04bf1d21d809950198aefab7b63b152c685f08b9bc497f SHA512 4bffc17a9a76ce0fd938ddd272587a294719262af38165686bafaa48a7a543068817b0b5136365e512a0f141bad06d545ded287786afb89df3bcd253280f30ff
 EBUILD vanilla-kernel-5.10.162.ebuild 3715 BLAKE2B 307a710805227c6da8af6a27356164d737c1d581ec44b8c37f453a21750bb77339c536745ccb302e183896a624034d691f705be1f6507a264adffe3aea2c3e48 SHA512 b723850925e6c7b7f9da1668f0f7df3e6c681de6982526e743e9b4f2a63e3b16984f8a638c76a5fb0d0dbc1980613ab41a90f8ad772054b71515975011d122f6
+EBUILD vanilla-kernel-5.10.163.ebuild 3715 BLAKE2B 0859ec6fa0c4207925572fc6db80ed8d89af637fc45717643d15156bf922bbdb79fdc458ee7111f46a7a11f395be1d6f4fc9afc82b21f5924b47c5007806908b SHA512 7a29fee2e69c5865e269dadd9bdb4c188a074e6378034d411dbaf967d81af0e411b14db0f17c24160d92f0c22c44348011079a7fb7668471dd19b87a419401ff
 EBUILD vanilla-kernel-5.10.9999.ebuild 3234 BLAKE2B d1ae98cbcc1aa58bb90e787f61a60a3a1f5936fc7667d2ccf9d441c1445bedeec835e40609c28b586e199adb2ea75b68b01b1422d712eeef6d8129c516afa935 SHA512 304afe6d49b898671901bf8d8ebb380a4adb774d3263ddb19b8797d97708badb281e5cff02ef95392057be52e13004902d59fe5d91f5a2d7db0a734ec91a321b
 EBUILD vanilla-kernel-5.15.85.ebuild 3715 BLAKE2B 5f9721371b3ba0e5498b275fa2ed31fdb6f640e2506d4d246076460f085f33f1850adca9db07260deccd65b92c94488f60625b0f8fdb66d9294ae2a697f16493 SHA512 84eae31a460385f9508ced76a7f3f02be83a2283e6691fe94b56a8e68bacaa4c97604dde3691903195fef01ab5e1f55063421c895aa8d1737adca071aabd9477
 EBUILD vanilla-kernel-5.15.86.ebuild 3715 BLAKE2B 5f9721371b3ba0e5498b275fa2ed31fdb6f640e2506d4d246076460f085f33f1850adca9db07260deccd65b92c94488f60625b0f8fdb66d9294ae2a697f16493 SHA512 84eae31a460385f9508ced76a7f3f02be83a2283e6691fe94b56a8e68bacaa4c97604dde3691903195fef01ab5e1f55063421c895aa8d1737adca071aabd9477
 EBUILD vanilla-kernel-5.15.87.ebuild 3715 BLAKE2B 342e25d7cb6bdf400f24ac65de1f2d9a77d6b06412361c62727ba4289656f42d056406a47892b2418b8574b51c0860caf8da6e417558b1117495020decf22489 SHA512 edfebfe20592f21864c8a1d025e8cb60f032d2102439dbcde8ea518a65d044eac9c0dc6a112545f590265c619ab822ea60e527a7463bb2aa02873e3b1c0fab3e
+EBUILD vanilla-kernel-5.15.88.ebuild 3715 BLAKE2B 342e25d7cb6bdf400f24ac65de1f2d9a77d6b06412361c62727ba4289656f42d056406a47892b2418b8574b51c0860caf8da6e417558b1117495020decf22489 SHA512 edfebfe20592f21864c8a1d025e8cb60f032d2102439dbcde8ea518a65d044eac9c0dc6a112545f590265c619ab822ea60e527a7463bb2aa02873e3b1c0fab3e
 EBUILD vanilla-kernel-5.15.9999.ebuild 3234 BLAKE2B 996eac76e626ce6dc0a984e1edd9a0c0b7e5676c1a7537ec30f49041658600daccef70fbf325611dc1001ab5e73c24f5e107f7d78bc7460b911636c38c13e0f2 SHA512 505cee407fde3af7ba4cd631f743df29a1770396828de0090b1fb371eae3f811754bef70f8f6f61bf8eb2505285fdf93dbfe600d8fadaf5f0878a557388060e8
 EBUILD vanilla-kernel-5.19.9999.ebuild 3354 BLAKE2B 7d153d91d316f3f1a27a4f44d3b0d455182b046d0db44bf34adc00bcee00cda1e23cdd359bc655d8b67c74763cad8364a582c28fc57626e0ffb836ce4eeef369 SHA512 de41900154fc4c6e44b63e68caa6d87c60934acf4453b122103f1e655b10b23c601365af65d1af45246c4fc3cd763ab73bfd828e118398ec5b09d0c5b69d3f08
 EBUILD vanilla-kernel-5.4.228.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8806b7e10af269041a7ff1d3a8d7b3df4ef767ebf12829b57d32892d9795619e946a574b704004da55b6f8641e71d832e69 SHA512 5068ce6fb368e17c40629eedc4cf78a7a5b9ca50b102d0378fe0022eeaba14ef710da4f5b31c7021b013c7745fcf52c569bc0bb11c8cb3de038a6f150680edfd
@@ -82,4 +90,5 @@ EBUILD vanilla-kernel-6.1.2.ebuild 3833 BLAKE2B 1e15560940a0b62e1f80988346c5c9b5
 EBUILD vanilla-kernel-6.1.3.ebuild 3833 BLAKE2B ba3ea1fb2051ebf4427d8987443402d115b1b7edfe12d6cb58f18d3ec2ef9ed0a481fdb59221a87043a13b96f870089fa1802038d34159cb813df73781142f2b SHA512 a46e4637d6a67f48717c94d15eea6dc1a86fbbcbe2f61c09ee3f914fd5c291e4fb59a67c5d0e1bb530085ca3b457ee242c5f799c44522fb168ca84959d5f0391
 EBUILD vanilla-kernel-6.1.4.ebuild 3833 BLAKE2B f21229dbf3992443fb50b3de7ba847e991474cd9af2013bdb483f2f3a8b93aa4188684b302c4759fc7ba4ef8361b98e60321d405c259e761a0f761942c10ceb5 SHA512 6bb78c451e683580905009f35371fbb881dc4a468f525e37f6399c71ef80ab0b22f976e620733053a047223ea85a6d8f1a524cd4d07ec80985c74502cfd0404b
 EBUILD vanilla-kernel-6.1.5.ebuild 3833 BLAKE2B f21229dbf3992443fb50b3de7ba847e991474cd9af2013bdb483f2f3a8b93aa4188684b302c4759fc7ba4ef8361b98e60321d405c259e761a0f761942c10ceb5 SHA512 6bb78c451e683580905009f35371fbb881dc4a468f525e37f6399c71ef80ab0b22f976e620733053a047223ea85a6d8f1a524cd4d07ec80985c74502cfd0404b
+EBUILD vanilla-kernel-6.1.6.ebuild 3833 BLAKE2B f21229dbf3992443fb50b3de7ba847e991474cd9af2013bdb483f2f3a8b93aa4188684b302c4759fc7ba4ef8361b98e60321d405c259e761a0f761942c10ceb5 SHA512 6bb78c451e683580905009f35371fbb881dc4a468f525e37f6399c71ef80ab0b22f976e620733053a047223ea85a6d8f1a524cd4d07ec80985c74502cfd0404b
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.163.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.163.ebuild
new file mode 100644
index 000000000000..ea9242645ebf
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.163.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g5
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.88.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.88.ebuild
new file mode 100644
index 000000000000..7aa02200877c
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.88.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g5
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.6.ebuild
new file mode 100644
index 000000000000..2b1628c7d41b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.6.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.2-gentoo
+GENTOO_CONFIG_VER=g5
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 2c07eb066c22..f5c1449808e5 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index a4dbd6b661af..f75c6310eb2e 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,6 +1,3 @@
-AUX db-18.1.25-sqlite-configure-path.patch 782 BLAKE2B ecca297f94f161010c05aa018369430f2e1173ac7c2f76f4f15b3965f88547fb4403282890394dfe897b9c97da9b89dc0ee7865264463f29f2647f032c47cb88 SHA512 442a7a43c47664ce806d3026c17997a5cb8b087ac6538c170b17bd42fc81ed0ea0f38b32c8cb6728e18ef7fffa5331b2e53f5e2e0b425d3fff8c260a6aa57063
-AUX db-18.1.25-test-link.patch 1425 BLAKE2B a6a586008fde747c36734dfeff77178e1fd97c76ed87d8bbfeb7fab20327b4f224382269bd75255f80dbda3021e3d15fc93f144667ab6c0ec5bb491577f1ac51 SHA512 ccfe99fdae653d8380288ddbc47aacae52957ce8eb4970dd5cb877cb6bf97013f60244ef64ff086781e2abd3b2106f8a832bbfc190539f88fff2f05f678aa3b6
-AUX db-18.1.40-fix-docs.patch 613 BLAKE2B 5b3c5f8b35624eac5c14caedac9ffadecae26122a0024b2c42c75d9c10e8ac414b2195a29cece5a680ef30355d20c5bf5405dd7bb03647fbf2d603c5abc66417 SHA512 ddd0daa3de0efa363764abf1dade45914f6bdf44d883c2b0b3ea1c96c2cff0889b5078beea274113169c9b056135a09905e5083d6be3e3139e74f86ef61deb1f
 AUX db-4.8-libtool.patch 2080 BLAKE2B 9a3dae0587dcf97f41b2991a577a92a558cf8c171c14e703dc5e83ab8292a00e37fb939922197c0b0dbc96c6462faf27cead0fa3535c0e798378d8c2b22b546a SHA512 b1298a1f98c7a99a05cae1f205550d7019a488c9f049bc5e6ee32d4fd7a5ec852ae4d41b7cfe928917b57b9e9949460d907cd5926fa7cdafe1c8749191996218
 AUX db-4.8-wformat-security.patch 983 BLAKE2B aa0c4abb5b76f8c53fedea89fc730a74c0904bf90e82926ea3c00a633f34755552e7436aba45b66e2a473776df5f2d6356194b4d4ea918ef614a8b55308d6d2f SHA512 ccc5c7f0219668ff658603cb8439c480afadd74c3c197b3ba4b7a6575cbb3818fc481e82b832efadf008cf30764c106c91698073a554a74f551a281e29f2e8f8
 AUX db-4.8.30-rename-atomic-compare-exchange.patch 761 BLAKE2B 01d01cb784049f7d598945d205b560c84c1dfcb0bfad733a31182122c9be30177051284f364b2846805b4d639de1e259554b9bc89c092d285a577276eb83eaed SHA512 8733ccf1b6c3072b7035f4cc976b151bb5331a4be6a23736baccf05268f869f594fc39b843b37cdd5b84e48f8af035f05d676be0b17c6031299f682f4793b4f6
@@ -8,8 +5,6 @@ AUX db-5.1.29-rename-atomic-compare-exchange.patch 769 BLAKE2B a6110550327dbe154
 AUX db-5.2.28-sqlite-configure-path.patch 733 BLAKE2B 7324ab06fdf2b7c05ad03d4a91d9c62af8e0fe07db9474f3874cb3e8d50fd90e08d85a743d84062ef2ce1895d999572b3d862e3f525e719274614e2c3cf802cf SHA512 18f5fa82c236e6961711b0a41d43d2cd7b4a4b72759df69ba265a49a55023f17b1356b8a5d1c1c539d69eaaaaf4f525adbd7173acb3a8ab7eae838dd10f54021
 AUX db-6.0.20-test-link.patch 1395 BLAKE2B 639f40b16fd225a57825387d75ac8bd961b11ffe653a8f2b9fa9526251713e48d8c877624e257f63c6d88a6c601e787ae44120477aa517c37c1e279298dfcaa8 SHA512 206bfe3fce4b4f8476c5d885fe8f004ce4437e42e33a6b8944de780c58bdbd8c0e7380e43113be5efeae86fcd50a12f8fca96ceb38539bb9624898a24395d408
 AUX db-6.0.35-sqlite-configure-path.patch 748 BLAKE2B 570c499549fddd62fa4d14a6eb7830dea3da6b60a05c9be6e5e5169dd9ee7b2e032b4ba9669d8de3985a2717101f7b709e1c26efb5a3200d1aa0d6511bed5d16 SHA512 fd8a4eed5d54f3364c5d3509a238db1f1d62b3f13b75ba1e58a20659c83d038904562d32cc4cdde41b324623459e50071b507979b3fedbc85f2231e6784f1227
-AUX db-6.1.19-sqlite-configure-path.patch 711 BLAKE2B d00fe596fe422f152889fe0285a5b00d2fd0724a9406f27ef904cc533c0197c6ad340946256cf0ccc388b7126c61bcdbc37921c84028e742201d952c1f2e1df6 SHA512 d79c2520c75d0f96049e0b7ffa168de5aaee9050927d8b1ffaa5a4a7fc64b75654906f182e7aa5e0a33d55402655b2d10981849f15cf6b4bec5c6feb080de1c5
-AUX db-6.2.38-bashism-configure.patch 425 BLAKE2B 68e67fd52ffc11cdc23b8e19954b34a320faad8f001bb4282464caf48a5911f58db1824cd8f2803968f3b4b31084999b8b04967cd917111b099ec2d43138dd44 SHA512 b6c5e44055d2d763ddef12f48a030693deb0addd9b72f63896a9c9bf61a4ad243b0c663b3f8d60a84b5dddaea6b7fbb76f0bc9de53065b030a3431a59facc8c3
 DIST db-4.8.30.tar.gz 22887305 BLAKE2B 10487580a371fa97ef5e468e1fcc4af68490934a82467da88b723f7d4ce403cd5f2b77bd95c218dda58161fe30bfef81f5093a8e5176f5ad5f482251c07c6423 SHA512 d1a3c52b0ab54ae3fd6792e6396c9f74d25f36b2eb9e853b67ef9c872508a58c784c7818108d06d184f59601b70cc877916e67dfea6f0ee1ca2b07468c1041f1
 DIST db-5.3.28.tar.gz 35090431 BLAKE2B 5b77a4ec0945fa96ce6c2b452fb4b029295e037fa64d5ff8dcb3b5e01ee3501fd75d9a73b8f5fa54d8907717d93546fbb5348ee70119e877fa2f17d301ecf50d SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090
 DIST db-6.0.35.tar.gz 36532251 BLAKE2B 22fbe557ccc13e4b936db8ca7d6ba11ce42e477bbf39f7e472067e06fb5910b1147fa58a44ac944c24a51ea839f1c61edda6bd8f3c450acac0c13d7fdba11e89 SHA512 002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d
diff --git a/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch b/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch
deleted file mode 100644
index 83fe2d66765e..000000000000
--- a/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/dist/aclocal/sql.m4
-+++ b/dist/aclocal/sql.m4
-@@ -99,7 +99,7 @@
- if test "$db_cv_debug" = "yes"; then
-   CPPFLAGS="$CPPFLAGS -g"
- fi
--(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline --enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1
-+(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline --enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1
- 
- # Configure JDBC if --enable-jdbc
- if test "$db_cv_jdbc" != "no"; then
diff --git a/sys-libs/db/files/db-18.1.25-test-link.patch b/sys-libs/db/files/db-18.1.25-test-link.patch
deleted file mode 100644
index 5fb6d5fae7e9..000000000000
--- a/sys-libs/db/files/db-18.1.25-test-link.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/test/tcl/parallel.tcl
-+++ b/test/tcl/parallel.tcl
-@@ -296,17 +296,26 @@
- 			    [eval glob -nocomplain {$dir/$buildpath/db_{reptest,repsite,replicate}$EXE}] \
- 			    $destdir/$buildpath}
- 		}
-+		catch {
-+			set l [eval glob {$dir/.libs} {$dir/db_{checkpoint,deadlock}$EXE} \
-+					{$dir/db_{dump,load,printlog,recover,stat,upgrade}$EXE} \
-+					{$dir/db_{archive,verify,hotbackup,log_verify}$EXE}]
-+			foreach fn $l {
-+				set fbasename [file tail $fn]
-+				eval file link {$destdir/$fbasename} $fn
-+			}
-+		}
-+		# we will be modifying this file, so we must copy, not link
- 		catch {eval file copy \
--		    [eval glob {$dir/{.libs,include.tcl}}] $destdir}
-+		    [eval glob {$dir/include.tcl}] $destdir}
- 		# catch {eval file copy $dir/$queuedir $destdir}
--		catch {eval file copy \
--		    [eval glob {$dir/db_{checkpoint,deadlock}$EXE} \
--		    {$dir/db_{dump,load,printlog,recover}$EXE} \
--		    {$dir/db_{stat,upgrade,archive,verify}$EXE} \
--		    {$dir/db_{hotbackup,log_verify,tuner}$EXE}] \
--		    $destdir}
--		catch {eval file copy \
--		    [eval glob -nocomplain {$dir/db_{reptest,repsite,replicate}$EXE}] $destdir}
-+		catch {
-+			set l [eval glob -nocomplain {$dir/db_{reptest,repsite,replicate}$EXE}]
-+			foreach fn $l {
-+				set fbasename [file tail $fn]
-+				eval file link {$destdir/$fbasename} $fn
-+			}
-+		}
- 
- 		# Create modified copies of include.tcl in parallel
- 		# directories so paths still work.
diff --git a/sys-libs/db/files/db-18.1.40-fix-docs.patch b/sys-libs/db/files/db-18.1.40-fix-docs.patch
deleted file mode 100644
index 7bed9f1cbca0..000000000000
--- a/sys-libs/db/files/db-18.1.40-fix-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes
-
-  cp: cannot stat 'bdb-sql': No such file or directory
-  cp: cannot stat 'gsg_db_server': No such file or directory
-
---- a/dist/Makefile.in
-+++ b/dist/Makefile.in
-@@ -1299,8 +1299,8 @@ uninstall_utilities:
- 
- # We install csharp docs even on UNIX so we don't have a 
- # broken link on the landing page.
--DOCLIST=api_reference articles bdb-sql collections csharp gsg \
--	gsg_db_rep gsg_db_server gsg_txn index.html installation \
-+DOCLIST=api_reference articles collections csharp gsg \
-+	gsg_db_rep gsg_txn index.html installation \
- 	java license porting programmer_reference upgrading
- 
- install_docs:
- 
diff --git a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch b/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch
deleted file mode 100644
index 103e3302bdc9..000000000000
--- a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/dist/aclocal/sql.m4
-+++ b/dist/aclocal/sql.m4
-@@ -96,6 +96,6 @@
- if test "$db_cv_build_cryptography" = "yes"; then
- 	CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1"
- fi
--(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline " && cat build_config.h >> config.h) || exit 1
-+(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline " && cat build_config.h >> config.h) || exit 1
- 
- # Configure JDBC if --enable-jdbc
diff --git a/sys-libs/db/files/db-6.2.38-bashism-configure.patch b/sys-libs/db/files/db-6.2.38-bashism-configure.patch
deleted file mode 100644
index bea1f3d3bde0..000000000000
--- a/sys-libs/db/files/db-6.2.38-bashism-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/dist/aclocal/types.m4
-+++ b/dist/aclocal/types.m4
-@@ -188,7 +188,7 @@ AC_SUBST(db_off_t_decl)
- AC_CHECK_TYPE(db_off_t,,
-     [AM_SEARCH_SSIZES(db_off_t_decl, db_off_t, $ac_cv_sizeof_off_t)])
- AC_SUBST(db_off_t_max_decl)
--if test "$ac_cv_sizeof_off_t" == "4"; then
-+if test "$ac_cv_sizeof_off_t" = "4"; then
- 	db_off_t_max_decl="#define DB_OFF_T_MAX INT32_MAX"
- else
- 	db_off_t_max_decl="#define DB_OFF_T_MAX INT64_MAX"
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index e568153b4bf6..12333c7165fa 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,6 +1,6 @@
 AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d37373370748690878b4171709028b7b894ad2c76c9188496ab089a46645ad6f9fca09fa4f89cdcb444e1400747ee358c079441661 SHA512 3cbd4bbd0827801faaaa2198eccccb285100cdfc43525b70816121aa70b32dc2c8479c53e16b9e99920926b1b11014dcc19909c4f72a09d9d19fcdb0fa6350cd
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d SHA512 3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
 DIST libxcrypt-4.4.33-autotools.tar.xz 624316 BLAKE2B 6a396d079ea011fabc46ae2f972e230f3e047f75f9c79c8345fe4f31bad24b9bcb50b3f1131fd5d34cfaf0d6e0ca4fa0a0418448390de95bdf78b0ab8022a72d SHA512 998ef7ca565339853458961c28a0bffe04a4859de305019efae9b586d7b28ba42210b238695680dc10d739e7947f94e4392b9022a96ed25a613ef9a29a888329
-EBUILD libxcrypt-4.4.28-r2.ebuild 9203 BLAKE2B 6405af69c3d4897073454f0af1eb7db72ecf2b98c3313a4bde8b15aa7b8533afed835f331dbd02f647cf64c7ee8a63b59838754cd4a9e860a61a063b4ca54c59 SHA512 1bbdfa4e639e81a88afa71cb8ad48e90d70b695d511dd2fc9070b7fa83112c10894406c327e4222eeae1ac67610914b76552b66463dd7522f9b96d656eef4c06
-EBUILD libxcrypt-4.4.33.ebuild 9037 BLAKE2B 0457918ee679a5973b07af4857b820295fcb88d8f8a380aa8b43fb1e93b5906bf9f6bc5970159c2ec4c7dcd5df3beb540b054fe872f08ffbdb7a629d7b877faf SHA512 edd1c35f475a1de4a123797432028b55261016c0ae13dab81867c9a6ee8bbb4cc404a76e9e5dc14e27c5452083ef554c480120b7323a272ea4c1571dfb2b3542
+EBUILD libxcrypt-4.4.28-r2.ebuild 9464 BLAKE2B d5171d0edf8f3028b0e099273a4adfed9a4e7b4f8374f181f0802c37fccd096a6ab2e1823b2915191f54f7b7d48a2e7cd9fe7c91ca156e3f08fc09a50c33a885 SHA512 7e66fd6af9a2f925b881d23351ea3df2e50d8bce59830b253925b9b813b649594fd26b9700c8823a1ebd29c52079d0002b1a99c7367a82c2a6978986b357f640
+EBUILD libxcrypt-4.4.33.ebuild 9298 BLAKE2B ebb872adc7e42a1ad49c9a6198a49474b85de307139b1421cec38e5c06e7298f09e143d43ee4947713afba9d2eb14b4be6bcea18746c226a641062b751e2d615 SHA512 8ec778eb3c92c124188d09aa01af287fc339f054758e0a8d4b1302bcf3e3b5c05686b47f0b9430201e56e644d34f8415fee7339c8c17c41ba1464f5deaf42980
 MISC metadata.xml 913 BLAKE2B c2b3f52bd72bb46b0de4eb4a5f47dcb3aacfd248b811bcdc88db88c6f9cbe3ed1af4fda3e643b350fd22131273af03f2f888d78d306f0f7274d9432eb65075a3 SHA512 0ebbc3c2aa661f1a40e7f654384a395662b1b0235f145c7778b7b86bfb65ad09d4e8900bc6ede94413f057e769397c355bfd1bcafe8540acbf7e00e5451400c9
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
index aadddc16912a..4e9c2fb26ca2 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
@@ -129,6 +129,13 @@ src_configure() {
 	# https://github.com/besser82/libxcrypt/issues/24
 	filter-lto
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	multibuild_foreach_variant multilib-minimal_src_configure
 }
 
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
index a793f41d2d62..b8e357fe4526 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
@@ -131,6 +131,13 @@ src_configure() {
 	# https://github.com/besser82/libxcrypt/issues/24
 	filter-lto
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	multibuild_foreach_variant multilib-minimal_src_configure
 }
 
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index fbd175ccbe6e..bf8e8a26e48c 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -6,5 +6,5 @@ DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d
 DIST zlib-1.2.13.tar.xz 1296496 BLAKE2B cefcd25989ce27e7d339af2a88455fcf64f6f5e647bedb0f05a45e4370a885fe45a60c023aa63e79b8ecf20ed3254d0052245f33f5769aca2838b42242be14a8 SHA512 9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725
 DIST zlib-1.2.13.tar.xz.asc 235 BLAKE2B 29206175f06b4e36960fc6b9403101f55c1f5b768e1921ce1402217bc85978b9fba1a4130db2df5c148b6a1c947148372be20ff8c4ce337c6f2541b42fef7274 SHA512 ca5decebe9572e77e88bac5c5119bfda7e222ed3944e4692510ae70fb5f01d8694b59a6878472b84e6b61d2d1682d94473b6312832afa520a2a23293572ea621
 DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
-EBUILD zlib-1.2.13-r1.ebuild 5336 BLAKE2B 535640d56bb322f8a8b8b35124041cbf37d2740c32c1de332f5fb286184a90798501f369404d24876edf5fde9d41a29b857a70977993171e4579a485bb0c38bd SHA512 788db5fdbb922b82961d0f7ca4a7d05429fe6506624241422ca443d70b6bdac2c4ef1b89dc8ea4b0f4c36a07b700d26c571d70479550556df8b2d949b6c87adb
+EBUILD zlib-1.2.13-r1.ebuild 5613 BLAKE2B 225f47847f9d86a01b72a7f5e81d33e2a0a8f5e291d5e14965b2a22a0e746af72cc4eec4961859a65e23efca8d935ee7d3b071118c4226f2578c4960a6975d2a SHA512 948e3d83ab12386ee86152be7a59129644de3ee6fedb3b615800a777ed00bf9a56b9fa9ad84bb1bb62efdf5ccfa94359ae4509309490514e52c19d0fb6ce4a3e
 MISC metadata.xml 494 BLAKE2B a4a57a4153aefc189e407bcb8ce84f7c94581cc66967f69097087da7e6ff48d2de683b919fb00445d095c47ef39d31e01590f8c989ce0e5e01474e73ee2a0565 SHA512 a7e0160c127b3c2a6afe99e95992d9dbd017061303759c299ec38800efd6a9e11a35ae850c23c77c09c8833cd9d61ac1267f6becadf9c22437ee35e4304400c9
diff --git a/sys-libs/zlib/zlib-1.2.13-r1.ebuild b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
index 50b767a0ef31..30d4a7c1a33e 100644
--- a/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 # Worth keeping an eye on 'develop' branch upstream for possible backports.
 AUTOTOOLS_AUTO_DEPEND="no"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
-inherit autotools multilib-minimal flag-o-matic usr-ldscript verify-sig
+inherit autotools multilib-minimal flag-o-matic toolchain-funcs usr-ldscript verify-sig
 
 CYGWINPATCHES=(
 	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch"
@@ -92,6 +92,13 @@ multilib_src_configure() {
 	# because it would pass it even for older binutils.
 	use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments)
 
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	case ${CHOST} in
 		*-mingw*|mingw*|*-cygwin*)
 			;;
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 82a4e1ecc294..a944d6f0e839 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index c788c9b3d089..210e179a6d4a 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,8 +1,10 @@
 EBUILD dist-kernel-5.10.161.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.10.162.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
+EBUILD dist-kernel-5.10.163.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
 EBUILD dist-kernel-5.15.85.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.15.86.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.15.87.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
+EBUILD dist-kernel-5.15.88.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
 EBUILD dist-kernel-5.4.228.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
 EBUILD dist-kernel-6.0.15.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-6.0.16.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
@@ -14,4 +16,5 @@ EBUILD dist-kernel-6.1.2.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c2
 EBUILD dist-kernel-6.1.3.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.1.4.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.1.5.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
+EBUILD dist-kernel-6.1.6.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.10.163.ebuild b/virtual/dist-kernel/dist-kernel-5.10.163.ebuild
new file mode 100644
index 000000000000..407f5d349eb1
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.163.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.15.88.ebuild b/virtual/dist-kernel/dist-kernel-5.15.88.ebuild
new file mode 100644
index 000000000000..407f5d349eb1
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.15.88.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.1.6.ebuild b/virtual/dist-kernel/dist-kernel-6.1.6.ebuild
new file mode 100644
index 000000000000..d3f0fa8764cf
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.1.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/mta/Manifest b/virtual/mta/Manifest
index 4a746ef0b3bc..17fb476f83bb 100644
--- a/virtual/mta/Manifest
+++ b/virtual/mta/Manifest
@@ -1,2 +1,2 @@
 EBUILD mta-1-r2.ebuild 644 BLAKE2B 060b21ff5babeeb4ee4cfca7cef850c9af4096b54bf542895fc3ae8d09f8581abf75b734136aa8a03b8a75a6ca44078b6fb93a17dc88b5502300f55cf6153016 SHA512 4ce64b63614cc194a3b97200b5d402478dd57f3a1a0c3b2e1e73cebe22c873ec14889ce545557e5c039d559707dd8306a1a2af10e0dc6de264195c90f0b838a5
-MISC metadata.xml 192 BLAKE2B fef49cb9e1dda8063c379e650d4897670410d2c0641f469b8a200d5e7ec8d3f505e692277d03b583790cb1340ece9c2e8f7e7c9ff5080d42a2e0ef3fc7138a44 SHA512 bece454b8da734c7a28ce25f8080b3fca56332e57cde854c50f0b884ba3836f1af7782a1ee9f63e6aeff4830e2bca71c5c466471fc82eee75339565aab6495d5
+MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184
diff --git a/virtual/mta/metadata.xml b/virtual/mta/metadata.xml
index c3bda71eefca..8cb7f9b298b9 100644
--- a/virtual/mta/metadata.xml
+++ b/virtual/mta/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+	</maintainer>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index ce5477c471dc..45af361464a4 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/tela-icon-theme/Manifest b/x11-themes/tela-icon-theme/Manifest
index 1302712a66f1..d078f4781dc8 100644
--- a/x11-themes/tela-icon-theme/Manifest
+++ b/x11-themes/tela-icon-theme/Manifest
@@ -1,4 +1,4 @@
 DIST tela-icon-theme-20220828.tar.gz 3707567 BLAKE2B 61a72b96df08cb5f3ef80b7aea5ca05e9b142607672f7213494c6f9fd0f458eeb87bd80842e14b7ed260f533088711f433357179c7c53d5beeeb76bafe2817d5 SHA512 6f0d26678ead12043bfc8943e2d40a507c2cfa8136a1556d53444efa5b1f6903307aead9255a38b3411980bd5353c3497bf224c1ed66a620d229b6a9a9079f83
 EBUILD tela-icon-theme-20220828-r2.ebuild 1772 BLAKE2B bf9e9a75ca40e30f7505262ba5c2ae3a9502a5b75ef87e6341138f31bcf126d36269dc0cee4acc0861ca78eaa3e90c27c5c7ad1e37d2fe24b7507b6bd354b255 SHA512 51411d628338b605047dcde4349e4876120681f11aef460909527a1a015c48705e695ac8091e0c0107393e8da9de090ebbfabe0d27bb343ac0bbe81ec9f6f9b2
-EBUILD tela-icon-theme-99999999.ebuild 1780 BLAKE2B f8f2265b60457073901d6bb45d441267e3a07c36dbcda1171d3a64bebf068d833ae7e32e8e05c20e159d3d72558408354113dc3317188eec6cef3534df7894b8 SHA512 6a4bc463e03477cb8ee0050b4e71f55a808a36dad05516616b41c380df666eb5c4d52c18e03a41245226769c9c5b3d425a3be72b107dfab1fd890879d962c45d
+EBUILD tela-icon-theme-99999999.ebuild 1953 BLAKE2B 18701e2532b99ea069589c1ad810548f7a36fac4263e77fbe36d699260eb83a7e935d5facbcfaaee283e7f1dd7734cfac2d1ed5b315634065c7fef0a40b4dc3a SHA512 805065b9c0cf43fe7b9c0edb212440672a5e0196480e5238dc7d208327562a9a9c05010bbc4a6261c0a1dbf497cc6856b63c85fa2492ae77cf529e4e0948f926
 MISC metadata.xml 1521 BLAKE2B 432d1d11f24b5a9ebc4b11218b37b0e760cd503fefeb3638618776c8c9aca315939176225e5f5e6220b14c2d65d0bcc1b99ac2bb1743458ee89fad4182a7f830 SHA512 7ab50cd382cee2f703cb2f948cbc1c431a9360804a87f5c9a5e0016d614648a76777ce81fd094c0150a1c1a5229240d0f3702526c0dc72092bbc78016d3e6237
diff --git a/x11-themes/tela-icon-theme/tela-icon-theme-99999999.ebuild b/x11-themes/tela-icon-theme/tela-icon-theme-99999999.ebuild
index b591e1d0d963..9f99ea192c05 100644
--- a/x11-themes/tela-icon-theme/tela-icon-theme-99999999.ebuild
+++ b/x11-themes/tela-icon-theme/tela-icon-theme-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -56,6 +56,11 @@ src_install() {
 	)
 
 	dodir /usr/share/icons
+
+	# FIXME: remove after merged
+	# https://github.com/vinceliuice/Tela-icon-theme/issues/223
+	rm -v links/scalable/apps/preferences-desktop-keyboard-shortcuts.svg || :
+
 	./install.sh -d "${ED}/usr/share/icons" "${variants[@]}" || die
 	if use hardlink; then
 		einfo "Linking duplicate icons... (may take a long time)"
author	V3n3RiX <venerix@koprulu.sector>	2023-01-14 23:53:26 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-01-14 23:53:26 +0000
commit	3bd85407abc9ed4434c2d3741f84fdb512638b1c (patch)
tree	15a296c276aca23d87cb4f2181f2249d706ca05f
parent	a90c84e720803f3d26c0ade8f1f1e405ca97502a (diff)