gentoo auto-resync : 28:12:2022 - 20:13:25

396 files changed, 2114 insertions, 1941 deletions

diff --git a/Manifest b/Manifest
index db10c60637db..c28c79b60961 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29811 BLAKE2B 94709a42d6173666817401f4475ad9685a17d725ddc96569ed28c53609f516690c43094dae25d408fecee78669aa25f419cf60c4fdcba964ddb80c0bc222863e SHA512 9db51b82ae544f8f3dbc05ac512d2a226279b6c54608544b3d7305f9f95a6c9566bb4e85c763771fc5a6632fd3a53f2ec89c69b70e542e600d8140ed737d0667
-TIMESTAMP 2022-12-28T13:09:46Z
+MANIFEST Manifest.files.gz 29810 BLAKE2B 8b676deb23d503841008280e02f37b49c9c34a04c1f1abffe11e724bd843049aea5a4019ce35bc88a69a1a19fbdb37405911a3243a45bf530f8e94b878daf988 SHA512 acd1b60422100c47a0b8d09949089b36d2a0a45365ce0b1a040a534969af016aaa0814bf2279a583d7ac8b7308c31f5d0609f8dac5b514594d6f7432f80379b1
+TIMESTAMP 2022-12-28T19:09:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOsQBpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOslHtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDzIg/9GDlXG/f17Bf+JwfWMMHuigeWMVkeyP0Ov5MjO0M20sy8/VYecoGBiRTw
-oZ02ju4e1/6ihN47AQ/Y6DWdpdJlR2hVccDwGhwiOLasjjHq2qT09505M33X5ZYV
-I1nu+nG64lkoXQ+z5KJVjL69UkBsyi6JWABRxbgiqt+TkE55z0k4O8366htFRXs5
-uEO9Bet/F/HzMpWn8HUhPqHABNSEFWzCGKpehSfVipJI++ORJLI/udhI9cXTABrX
-tNbJnO4dt4ckINRHmQbCMqO8eig2ChkjxX/pT7lwMKL4Yt0V+cDOH60kGI/itwNw
-3OAh7DtACberPEm8DxaANNJBlNxsx3IYeiL1JHaKLaAx7EW8hkzGcMwqxfRJSH8m
-nSr59UPkC0k2LFh2ZKnnqQWDgzdfGoPsPlMpE5oss7+Z6/cVn7OJ0QQ+q0hpZZ1I
-5Vco5j97dktBvCodpMOoUj9VUGvhtm/Pco7OfKXBsIV2x47fQzP4hijit4Uvtc8m
-iVItvPmzPTZNhhBEVORhVafdZ1Eqge25X8QhPfa3xxUB6+wye/DUgW/tZHs4uMcW
-Og84xVXs/J1DBpnKlI8mcS7bI57HjdextJo4+hmURN3M/xdSVXEZm7tW0L4jesUT
-oBzJOrtP/+VXGfVarij/CduQwj4l1lKDN3mPGr1lTIVQOeIH1HI=
-=DM9a
+klAFOhAAj+FRjDYQ5hmWSV15Ee5Yt6vdK4IkTrTBikxG2aA0u4PlEFBWygKYkLmE
+CNXZvu401LARuXqarEuwt47jVgdoeOnUSE4014fa8SpCHoBHJbB8fW9xshycLimj
++X5LKn4unyHp6myr9GLB6NgruAC0mQesHRJvYZ8WQtdL8RfSzheEy9770bBdDgvN
+gau9OMvB5jb6SyNm+lxv+0gVfdZFf3LRUqf15+4xS+2gDr+b881lHrbrAVogJueM
+GJDMFpbypnQLhWtDhDoAbs3RfRzH8TXARwU1a6dKQJMCDGiQNCMlRC5zGa0bVNBD
+7asMuNI6PV8x3IILEiJ9dZbKR3hX6Enn2pXC7OSnYzN3JzNLTSlV1mKkOyJDYNfs
+SHwdYru22MdRqNOZ6qxtpEYj5bVHZabCcIpeUveAWbIZLCbKpPIodkhKQnvQPFll
+lF/yDIjJo9PR0hFGoUIcFib7D+r2dIvb9iT5Ir/7UNs9iU5FCiYRqxp+CeywW3/p
+fjggTiefV16Ody6gPXVOke6NlDX4tqvwDECuVmw22ICYnggo19mTn3Zp98IOECc+
+10lN9srsgwnLO7VhRffqGuoKfhNo/4NO4v2+Eye6zwCIT/W7x4tMmrcL9rRa9NXB
+/1k3MWPpHkc44uh5HLdsicx+SqBacZWdipeWSGvl2SGGi//btdU=
+=saie
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 5f4470e0d141..f9aa3105016f 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 14c88ee40869..23e6ea7cce27 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 4f05e6c5ed44..a008e60ab2a0 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,8 +1,10 @@
 AUX rdiff-backup-2.0.3-no-docs.patch 972 BLAKE2B bc7a6abb337d306c2e2f57f704466836a81ed3f3215afd646a10750274f0ce4bac1bd3f02545af71b0b834e51a6dd26aabb48449dc876d743045bce323408818 SHA512 b3a25b6d18256381fde7ae9cb91d7eabedaca27214398fb29949b5a816d2ac0dced8dd188aade8469186cc82df8e4c5620489a3ca0f0598b337885a8fff3b741
-AUX rdiff-backup-2.2.0-no-manpages.patch 1627 BLAKE2B 5662aa2a29199150fe78da472638edf3df20532274e3b077e752e6a14471c63c104bbb51661335a739961f4df43475a4ec1eca2c2c89c955c10dc9b508bb2e02 SHA512 f40f377372bc0cf83d8cabdae573828675ea36352345ecd2cf5ccff8a1da9da0dafd76aee9e8195fcce4acb9172efcc1a33f4bd594c590b19d96574f66d9597d
 DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd
-DIST rdiff-backup-2.2.0-manpages.tar.gz 30062 BLAKE2B 88a9afa238e7a1551aed5f60801d5445a268a6a0e80035564a8a37379f2e356a7eb8f9f39180948a7fd12ba153e08f400c77fa5badc61f79f322054842cad81a SHA512 23f2112b16e4d3340a15be3c58f2a716177268a2d38e5ba28eb72230522a25799ae3a8faf5ffc777777fd262023b2b2dfab09198112bb24751a3a8c4766e85af
-DIST rdiff-backup-2.2.0.tar.gz 903121 BLAKE2B 53adaa64842609e40bbc7aafc14b9a2b062fb5aae17ee6eb5c649a93f7dddc99e3ba681587aad2f9e1adb7fc8191073ccbbcb9e26bf09a90274740b013fd10e3 SHA512 3cae2ada5766c85c7aa1d1c15bd4068e406f524143abcae58775ef24b022ceec499c3262e54bef184f70a1c22c4eb2ce3fb06babbaea64dc0a9115b80831fde5
+DIST rdiff-backup-2.2.1.tar.gz 912681 BLAKE2B 5eb5a2aebb60bac84b836fc76a687695ccde679e6f7eabf22c948f38575f50b83aae339ee77c5e8b6c119e9dff6b4357324908b2e31cef3e32980e2016ff4477 SHA512 f57431cf3478791d2a5b6ef970768c99490737da811237b8c45a0adde8f4ee44ca17fc77ae39f73d0ff2587f089b6f8cd7d21f364323618b24c52bcf1d3864af
+DIST rdiff-backup-delete.1 1957 BLAKE2B c270afbdba56776e1e9449af03bd9a9903219fe04e2eb7ee5695bf59a35ce13da690e14286fbda1e9120ee0bad733fd4baa7271406c457f91a04bed85f598232 SHA512 97eeb64e800aea0653fc1d5a3b517db74b7d95dce8bbd8a406a9dfc3687a207193f7f289e8fd77837419a1c9e796e5446d83147597b9998978426a6c9b86e318
+DIST rdiff-backup-old.1 41328 BLAKE2B dacbf5ae1313dc4596124ef4d5887cdaf75c0c15be6a76239668ae60ea6a6dc65089f99fa6f02bc858d339b8b0466fac3dd8b5992d01ca42f9641e40465ca552 SHA512 cf07b579393bde71cda7da74fea7d974346ea9366ff51af4c24d6215fb2978bd925b4d64a8a1008e5b292d23529ac8499e407cf17590c7e9876d737d42651c72
+DIST rdiff-backup-statistics.1 3961 BLAKE2B 9be7c279d3f24e7c4a391046a027d5b2ef03653d6079176f648e0359c12f6811809859cd67c5bfd1d01b271409cdaf64c69f44d11d47d1e612456a3402531fdd SHA512 b31efbf32538fc2d3c65be2d7fb1166a7a13ca66449fea38d08b00d3dca79e436df930f81e0bd9a3f8fa16ebf30633a82962f7e37376b12ab87544d8103b5290
+DIST rdiff-backup.1 53335 BLAKE2B 996ba1ef156171d64e4b909e4dab9d2d94998fad555a1460f4d0b97ea937ed9f236a63cf84e2f4641a0b5c78ab66bd6e58695168c168d4f24b2b9c379a9def3c SHA512 9fcc0e94b03d539b0ed9326186abd73a9417f5feda9dce924961726865998b0d69076d8823a7b2ae72e1bec108b6714fb664f269ff7d8e19293e55c5779b7d72
 EBUILD rdiff-backup-2.0.5-r1.ebuild 1012 BLAKE2B c1ef8d9afb892cb47dee4e2201953467f56faf7751ae477d23ecfb34a846b28c7bb0f0624728f2c03d343c592a07e67cd0b0b8e553193fb45b5b561f2f3b34b7 SHA512 4007839a1cf39081ed66a5de4de32bf189b313d370c8934c865f1f81745e8d7e4fcac1c6b7c6a716a9bed463d10f0cf08b8a0d689ea9566caf014efac8b207d2
-EBUILD rdiff-backup-2.2.0.ebuild 1155 BLAKE2B dfef04919ccb2a2b9f1624dc97771a7b9597c75f6dfaca5e44bf15e55291f21746dc552032137685d95be0e6c93f818c4287a59cb3a0b1c2ea0cc7cb08890155 SHA512 4bb52a1f69ade65750d97f48921935309fc78a513e587e1d08bfc04b3778ec907820868b61b9099b47ea46712421a9306fb114acf6621a98b293624fbb5cd74d
-MISC metadata.xml 343 BLAKE2B 6ad7958e3c4aea63c7f11fa7810796dc0a83d8bf199e84e44aa3b60f67487cd56ed09ba96c1e7b138ec38b9b812d4b5450a34f81ffd5a5b849c3aad22f1ae38f SHA512 68aad43eb0e9c6e48f3203ad5596384865b0ced8fa46f45aa5214450d6c840cd0ffe90d975435cee4ee2ff58950486430a29ecf37b61e9e539cc8c8300425d53
+EBUILD rdiff-backup-2.2.1.ebuild 1221 BLAKE2B 499334725cf73b06e2bf05657a4ee22e7570bb9327ae4e6328634e67131b213d690332a79e13a93859351b498ef856ee9529f5802b7a698e9c1afa7a56188279 SHA512 0ebe0846324e4890c28e6e7341bdb0c8c12a33ec23236c9d1ca1c96f0d4182d6b67eaab2d1b7b2d6e488ca648191be92797fc376bfd2d0ff886ed60baf180162
+MISC metadata.xml 393 BLAKE2B 345d8ca991657bcc7a84568942ff68f074568c247a6b68bd650967673e1ea126045ddcd4c16d8761bfd763b6daf86856fa5e4f7c503db2417e8a5eec47d6595b SHA512 c2ac0d3e6ff267541b42dc421ffefe57b4c8b34b57123a2fa2f9c9137deffe380202b97bacb989d0b11dfdc66daf76c3f3969d6bdfec2aaaa45bc57d7f5c6491
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-2.2.0-no-manpages.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.2.0-no-manpages.patch
deleted file mode 100644
index 207bf6cfe106..000000000000
--- a/app-backup/rdiff-backup/files/rdiff-backup-2.2.0-no-manpages.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur rdiff-backup-2.2.0.orig/setup.py rdiff-backup-2.2.0/setup.py
---- rdiff-backup-2.2.0.orig/setup.py	2022-12-18 09:19:30.000000000 +0100
-+++ rdiff-backup-2.2.0/setup.py	2022-12-19 22:00:43.289239007 +0100
-@@ -283,10 +283,7 @@
-         ),
-     ],
-     data_files=[
--        ("share/man/man1", ["build/rdiff-backup.1",
--                            "build/rdiff-backup-old.1",
--                            "build/rdiff-backup-delete.1",
--                            "build/rdiff-backup-statistics.1"]),
-+        ("share/man/man1", ["build/rdiff-backup-old.1"]),
-         (
-             "share/doc/rdiff-backup", [
-                 "CHANGELOG.adoc",
-@@ -311,19 +308,6 @@
-             ("tools/rdiff-backup.spec.template-fedora", "build/rdiff-backup.fedora.spec"),
-             ("docs/rdiff-backup-old.1", "build/rdiff-backup-old.1"),
-         ]},
--        "build_exec": {"commands": [
--            ("asciidoctor -b manpage -a revdate=\"{date}\" "
--             "-a revnumber=\"{ver}\" -o {outfile} {infile}",
--             ("docs", "rdiff-backup.1.adoc"), ("build", "rdiff-backup.1")),
--            ("asciidoctor -b manpage -a revdate=\"{date}\" "
--             "-a revnumber=\"{ver}\" -o {outfile} {infile}",
--             ("docs", "rdiff-backup-statistics.1.adoc"),
--             ("build", "rdiff-backup-statistics.1")),
--            ("asciidoctor -b manpage -a revdate=\"{date}\" "
--             "-a revnumber=\"{ver}\" -o {outfile} {infile}",
--             ("docs", "rdiff-backup-delete.1.adoc"),
--             ("build", "rdiff-backup-delete.1")),
--        ]},
-     },
-     cmdclass={
-         'build_exec': build_exec,
diff --git a/app-backup/rdiff-backup/metadata.xml b/app-backup/rdiff-backup/metadata.xml
index 48db65ba4e09..2da39cb8a8f0 100644
--- a/app-backup/rdiff-backup/metadata.xml
+++ b/app-backup/rdiff-backup/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">rdiff-backup/rdiff-backup</remote-id>
+		<remote-id type="pypi">rdiff-backup</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.1.ebuild
index b65b8b6ec227..e479d6ae0ef7 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.2.0.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.2.1.ebuild
@@ -9,10 +9,11 @@ inherit distutils-r1
 
 DESCRIPTION="Local/remote mirroring+incremental backup"
 HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup"
-SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~voyageur/distfiles/${P}-manpages.tar.gz"
-# Manpages need dev-ruby/asciidoctor
-
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${PN}-old.1
+	https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${PN}-delete.1
+	https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${PN}-statistics.1
+	https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${PN}.1"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
@@ -26,16 +27,8 @@ RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
 	dev-python/pyxattr[${PYTHON_USEDEP}]
 	>=net-libs/librsync-1.0:0="
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.0-no-manpages.patch"
-)
-
 src_prepare() {
+	cp -L "${DISTDIR}"/*.1 dist || die
 	sed -e "s#share/doc/${PN}#share/doc/${PF}#" -i setup.py || die
 	default
 }
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman "${S}"-manpages/*.1
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index d3b9aaff3a96..768bf5d3cfbf 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/company-math/Manifest b/app-emacs/company-math/Manifest
index efd78ed38e5c..2dca9fd843cb 100644
--- a/app-emacs/company-math/Manifest
+++ b/app-emacs/company-math/Manifest
@@ -1,6 +1,6 @@
 AUX 50company-math-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST company-math-1.4_p20210731.tar.gz 10358 BLAKE2B 15834f0e7b59cff25c1c3b488f16b19701ee3b1f8a715aa169ba40d5d7e4fd1e9ad226a0c52af88740dbfc950f660c46edb18e0e0bcad3687fb81610bafe9e84 SHA512 66b770d1ac37fdc7bae08bf79751cf4b9a2803944222d733beb6ad63dbdf5a8879ba19dcca61ec83cd4b1add813417508faca1649022242ab2ad11189a3444d7
+DIST company-math-1.5.1.tar.gz 10443 BLAKE2B 5e6756b2035867f2931877f7b6d3e10b4b3e3fb20f5c04825496315c7862ee960739a5f23fd96e1c52a301c19e1bf6495f5b4ddc752a89e2dfdb7e42fa1bc143 SHA512 b87e5c83aeb43374d7461de06b9bf5e5a8fb8af7dd75413d00e0586392fb279a13d1d7b40311487d0aec0662868e61e3a00b6e1c08c5e0a44337323ac85e6d85
 DIST company-math-1.5.tar.gz 10451 BLAKE2B 0d05125ac787a92d9314bca9872777e4e2db8a2867b4d04b901ea90eda55c252413b6ecb5549702b0e1d1589b076f1fdf2320b02c77805f227593dfe561c132b SHA512 63ba598d6a32dc154b481c20f655203ade3af1cf430a3919874065d0ba364b39c05dc188e81b443ba7392721b35cd2f1e3fa3dabc0d37200bd8bb1872814dd2f
-EBUILD company-math-1.4_p20210731.ebuild 591 BLAKE2B 44c252c7e956e47bb73524fc9ad2a90d49130cf686105639cbeafdd679a4e2c87ef94ec31a3b02891812438b453ba1facd131d6e17d2983b46851a2ad1419711 SHA512 e065bbd3085bd0f6aa52d0a1eccbfd7e7605a4e1e2ef1c3d5e01ac3aa29b04ab23b066d969b0e25b4b1221d4e046b26708fc1f4774c3e664b6fc4fc4064705b7
+EBUILD company-math-1.5.1.ebuild 528 BLAKE2B 719483b1dc8b1e67ba712c446c0c3af5f217f3210a49c62df80b2e9c8bc4c72077b85cb3a016d1d33e7ed2ada43f9f0fe0c3a3073c2f7448dd00c9cafa9c570c SHA512 761977293f5efa261400025821e9b8565208ce579fa6976a7082906a309d76e2a3852ea029422baa9f9a2d6784410d264fce9b5f0bff52fd87b692541d385885
 EBUILD company-math-1.5.ebuild 528 BLAKE2B 719483b1dc8b1e67ba712c446c0c3af5f217f3210a49c62df80b2e9c8bc4c72077b85cb3a016d1d33e7ed2ada43f9f0fe0c3a3073c2f7448dd00c9cafa9c570c SHA512 761977293f5efa261400025821e9b8565208ce579fa6976a7082906a309d76e2a3852ea029422baa9f9a2d6784410d264fce9b5f0bff52fd87b692541d385885
 MISC metadata.xml 427 BLAKE2B 7e877b5bacd5c20ec705d27551c59d13f6baca742e32c2b49a2ba3887bbd4044c0bdc40ecea1e512e5ab3a4813c363439386e00d1b79247451531787c65370b4 SHA512 191a11969fa77e2c64359ac5bb7ddde99623bff374be4f62dccbb537470404179a8c3b7668f124efc30722b46230fb5f6e864a08c9cf1db783196925c6505204
diff --git a/app-emacs/company-math/company-math-1.4_p20210731.ebuild b/app-emacs/company-math/company-math-1.5.1.ebuild
index a6e3617b3ed2..8611ade7beb1 100644
--- a/app-emacs/company-math/company-math-1.4_p20210731.ebuild
+++ b/app-emacs/company-math/company-math-1.5.1.ebuild
@@ -3,14 +3,12 @@
 
 EAPI=8
 
-H=45778f5731c97a21a83e3b965cbde42018709afd
-
 inherit elisp
 
 DESCRIPTION="Completion back-ends for for math unicode symbols and latex tags"
 HOMEPAGE="https://github.com/vspinu/company-math/"
-SRC_URI="https://github.com/vspinu/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/vspinu/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -22,5 +20,5 @@ RDEPEND="
 "
 BDEPEND="${RDEPEND}"
 
-DOCS=( readme.md )
+DOCS=( readme.md img )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c149cfb5156c..724793895502 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index 308293215c90..3978c5e7bb3a 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,3 +1,5 @@
+DIST error-prone-2.16.tar.gz 2685946 BLAKE2B e10d38e5d0f6be102d64c4d24543f525c192300665a141d136d4bcb1db0e8553c16828411b60e2bca0d27a89fe7e094ac2fc2a367028091a4ad28b303c023a43 SHA512 c61d14e237ae45f3d1196e03ecdb5e77aa8aaa2f5983eee3667cc73951a12b1f0c85bd8a15c477c18fd517d486024d3b1f115928affb3697afc064d561b5f405
 DIST error-prone-2.7.1.tar.gz 1576363 BLAKE2B a204a6a0dfcc88e06ff4f9288764c33c72e1d0c692ba20ce34a1440025abbb96d510129e335a475ffecc037806c72a0e1a85f0ad55a5ee4402d7b731eabd057b SHA512 2e8ff78b2fc65a0a53244711a3b5dd3d42cd09c0c9cca8dde5c814ee3e9dbc6e2c44f8bdb778111c93cd867f9b85b8afae4fd0551eda9326c0a9b1aa1dcaaf92
+EBUILD error-prone-annotations-2.16.ebuild 965 BLAKE2B c3ba8197c52135e59ce668f7515be2753ac162f4157a28863a1c7902227191af4400af7dd03a5c3012f6937c99af8c26c3b16f5d381b847974d308102e897e05 SHA512 0e02e709aad2a50d6df3576681864233cff1a95c9e5ba998aa87558340d67d5c430607af0a52cddccd6d901cc80a969f69ec4a0cc63528135f9b810acf854893
 EBUILD error-prone-annotations-2.7.1.ebuild 928 BLAKE2B f49580ddc370cb985d8be8d33dd141324776ac6cd60ba6883711c9908703927f3a0f4afab60207c5f93490373c1f84959ea46c6a93fc7bee8eee131a0edec566 SHA512 54a0b82ed79a85dff80670fc45b54eafacdb480e774f1ee4652b0c03da22df7c07cc61a6bdbbc8413ce0d1bc6e1235a4038160e54cce496649aae9edc712c2da
 MISC metadata.xml 320 BLAKE2B 2e99f822caa8b83ed1ababb800cd9d3b1c8027e5623bc4498a475b7e0e72943c2140ec07c42a1d967472186094a0933fcc82b5cbfe45d1111f0fec9924e161dc SHA512 c47744406f133d3553b5982f0a7f690ca4bb360e76e633c30015489bb6489ee74629f4d6cd1986558932acc7b18449cd9840f9080f71d682cc6fbf97981cbf21
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.16.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.16.ebuild
new file mode 100644
index 000000000000..b12f83e9e5fd
--- /dev/null
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/google/error-prone/archive/v2.16.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild error-prone-annotations-2.16.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.errorprone:error_prone_annotations:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java annotations for the Error Prone static analysis tool"
+HOMEPAGE="https://errorprone.info"
+SRC_URI="https://github.com/google/error-prone/archive/v${PV}.tar.gz -> error-prone-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/error-prone-${PV}/annotations"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.errorprone.annotations"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
index 9bd5c8b445af..bfbd38e29f7b 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,3 +1,5 @@
 DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
+DIST guava-31.1.tar.gz 5583483 BLAKE2B b430257b6a21e8cc85b11241be3abc463d13d29d85c6e7a3e4240977213428ec92af63afb66d0637f6b6dbbab1e3493cfc684a6be21ba4633cec7c6df5d0a8e7 SHA512 660b486d82d526ce722130f2968ea8ab9eb53f5915f80e53ef135a7bfcb6ced9b2f2a50ebdb8b316cc48a4f2553fa067a1d6fc0bc4498774a9f1990a535651b8
 EBUILD guava-testlib-30.1.1.ebuild 1986 BLAKE2B 5b61182607c6996a2e8aee2e42aecdd7599f31b3fb48eddb081a90309ca80d7545ca3e97adbc06524a112567559192d00bd875ba388238973411af666fa833af SHA512 db0d1758354bb210d6460be7ab17c9aa306d05509ed5416d0318d6c5e70727c9090818c6624a35a6c16c12b2119227c5e14f9b5e8ae526dba5c2676a44699718
+EBUILD guava-testlib-31.1.ebuild 1650 BLAKE2B 4376ab15bc06b8e7b987aa06af24cca66a1c748fa84ee76ee798096a68733a5d2402112bce20d7a13025ed109ef7b00644730984bb846ea0f84f02b22fb09e54 SHA512 9ebc4e74cc50aa8c88d962196b796d6ec1d3ed61d28a91827e2c482906e054af2d4f3133774a622cc6527af9570e87a4505ed514bbca16977f67260e3029a91f
 MISC metadata.xml 388 BLAKE2B 619e640d22637685b8b59294275ab1a36e74839c5eb2f6002055cb40037406800379274d4085d41ce2a8f2000b6bedcd137b4e7fe38933734474f998e4cf909b SHA512 b44014388651d54e41671847c438c9ba03ff1a551924a82ff0ce12deb8f347e94f49469ab41413e052776c9b7893a1989d570f12454117e828051eef5fef1c11
diff --git a/dev-java/guava-testlib/guava-testlib-31.1.ebuild b/dev-java/guava-testlib/guava-testlib-31.1.ebuild
new file mode 100644
index 000000000000..4b42897f23a3
--- /dev/null
+++ b/dev-java/guava-testlib/guava-testlib-31.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom guava-testlib/pom.xml --download-uri https://github.com/google/guava/archive/v31.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild guava-testlib-31.1.ebuild
+
+EAPI=8
+
+# No tests because "error: package com.google.common.truth does not exist"
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.guava:guava-testlib:31.1-jre"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A set of java classes to assist the tests for Guava itself"
+HOMEPAGE="https://github.com/google/guava"
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: ${PN}/pom.xml
+# com.google.code.findbugs:jsr305:3.0.2 -> >=dev-java/jsr305-3.0.2:0
+# com.google.errorprone:error_prone_annotations:2.11.0 -> >=dev-java/error-prone-annotations-2.16:0
+# com.google.guava:guava:31.1-jre -> >=dev-java/guava-31.1:0
+# com.google.j2objc:j2objc-annotations:1.3 -> >=dev-java/j2objc-annotations-2.8:0
+# junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# org.checkerframework:checker-qual:3.12.0 -> >=dev-java/checker-framework-qual-3.14.0:0
+
+CP_DEPEND="
+	dev-java/checker-framework-qual:0
+	dev-java/error-prone-annotations:0
+	~dev-java/guava-${PV}:0
+	dev-java/j2objc-annotations:0
+	dev-java/jsr305:0
+	dev-java/junit:4
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/guava-${PV}"
+
+JAVA_SRC_DIR="${PN}/src"
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index f71ed9d64328..305874858c6d 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,3 +1,5 @@
 DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
+DIST guava-31.1.tar.gz 5583483 BLAKE2B b430257b6a21e8cc85b11241be3abc463d13d29d85c6e7a3e4240977213428ec92af63afb66d0637f6b6dbbab1e3493cfc684a6be21ba4633cec7c6df5d0a8e7 SHA512 660b486d82d526ce722130f2968ea8ab9eb53f5915f80e53ef135a7bfcb6ced9b2f2a50ebdb8b316cc48a4f2553fa067a1d6fc0bc4498774a9f1990a535651b8
 EBUILD guava-30.1.1.ebuild 1820 BLAKE2B 120c69dac6a1b6e2452f15173645d4b1b43b04411bf5979a67e17cf241e53dd98e27b88151f6ada7f4bea5018d66c57603d99338d2ac6d07ba799d8b925ebf87 SHA512 4c4760e49e08fc5dd474e1ca9763b1d8a63f094d0bbc47a1c0356f9bbb7a20d75f1fb75d945b3d3a970da1434dc7c88440adf28b78f2c94f567295140bea4704
+EBUILD guava-31.1.ebuild 1665 BLAKE2B 3eb4f8dd2d392d094abbdd5d99f9d1b6c87b0ded1e5598ad9acb1412a8801cd21893e974d238d1011a9dcbd59ed5ea0d1b1f4078fc30952166c78b78c943c69e SHA512 6e16efa891fa77361940af5a1ed6b82a235ad36bc66709e5c48e1c6ea65fdc3704fe073a1a008cc38f824bebc90d03d8d4792ddda507c0c17394a3492ee8da69
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
diff --git a/dev-java/guava/guava-31.1.ebuild b/dev-java/guava/guava-31.1.ebuild
new file mode 100644
index 000000000000..9ac8599ce3d2
--- /dev/null
+++ b/dev-java/guava/guava-31.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/google/guava/archive/refs/tags/v31.1.tar.gz --slot 0 --keywords "amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild guava-31.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.google.guava:guava:${PV}-jre"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://github.com/google/guava"
+SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.google.code.findbugs:jsr305:3.0.2 -> >=dev-java/jsr305-3.0.2:0
+# com.google.errorprone:error_prone_annotations:2.11.0 -> >=dev-java/error-prone-annotations-2.16:0
+# com.google.guava:failureaccess:1.0.1 -> >=dev-java/failureaccess-30.1.1:0
+# com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -> !!!artifactId-not-found!!!
+# com.google.j2objc:j2objc-annotations:1.3 -> >=dev-java/j2objc-annotations-2.8:0
+# org.checkerframework:checker-qual:3.12.0 -> >=dev-java/checker-framework-qual-3.14.0:0
+
+CP_DEPEND="
+	>=dev-java/checker-framework-qual-3.14.0:0
+	>=dev-java/error-prone-annotations-2.16:0
+	>=dev-java/failureaccess-30.1.1:0
+	>=dev-java/j2objc-annotations-2.8:0
+	>=dev-java/jsr305-3.0.2:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.common"
+JAVA_SRC_DIR="guava/src"
diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest
index 7d61d6ced566..6571ea4ff4a1 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -1,3 +1,5 @@
 DIST jctools-3.3.0.tar.gz 4214717 BLAKE2B c9c5f5897ebf8bb7ac439b969f372c45b7652517cbc5369c07fe80d11f779eebe7fe5ffb5d93a18fe3df5d9ca9adf3cee7268c8c6ed962fccb4d84f5b0451c4b SHA512 ce212abacca6137a133f7a4e94370442d00bf73794fa7b9ce440631701a9a2fca31c4dda05e2a768fcf28f75e84f2a7f318a936e429c7f4ed20daa7b79d11a4a
+DIST jctools-4.0.1.tar.gz 4234647 BLAKE2B 652cfc70d92a37e04056e306050b156632ba92b2cacd9b759556ea92e1b9b6dda3d766e33936cdd92ec690abb6fb51a562305f82746f500f89d9d797e27f9c54 SHA512 9c8f55be4640f7b1315e7f93c20cf6b4b8d84c542103d69a2e34c0abe00c25fb362b6d8c4042feb4462559e5f6babd90ab0a59a66c3d407e13004ff02ce95c8f
 EBUILD jctools-core-3.3.0.ebuild 2253 BLAKE2B 260724ac01c2202cfe685bb232a5533b5dd611b5e57d7c9e47fb06b35c8e66c1026622c0ee14c62e09535219c90225f990215e6b573e0113721c9f9c64a54210 SHA512 68a3b914db018eee7354adc21aab9502c533d5ae6e2b00347127ce97dc3a5639fb810a3d889d0100e5065c23af3be807143ccea974d940586b0362d5f3280b2b
+EBUILD jctools-core-4.0.1.ebuild 2303 BLAKE2B 262873fe82c14c15f3e0769a96fc76c3c98703c68392d62405c4b0a7d2ac6aeb00d2870fdada700fc728a1188add4158d7a331d618d80322388746f86ae32348 SHA512 4aac7d0acc859459f6cf942f0dc1fa7e6310171f5ac3e3766fd26839ea161f41f639af0aa5b8fd707043e6f6521c9873495c26a1f06c4f13724e2fdffc6487a0
 MISC metadata.xml 305 BLAKE2B 4ac1a7216894d3a7be6d9b4bbc034c2cb571ce0e9ec4f401eb4921f9c56b00296494be04d33b052d7f89684ac9a8d9b80385f7b33d7cb0a92b2ddb4bcc323835 SHA512 3ce5145f2b40c8a5bc7cd89c14ce33d6d194809ab70bec23c0726636ed516693f3cfdfe231e79fc1e3f3591ad950ff27f2632545fd69213a878be1b27d6f1f9d
diff --git a/dev-java/jctools-core/jctools-core-4.0.1.ebuild b/dev-java/jctools-core/jctools-core-4.0.1.ebuild
new file mode 100644
index 000000000000..63903c525b85
--- /dev/null
+++ b/dev-java/jctools-core/jctools-core-4.0.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/JCTools/JCTools/archive/v4.0.1.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jctools-core-4.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jctools:jctools-core:4.0.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Concurrency Tools Core Library"
+HOMEPAGE="https://jctools.github.io/JCTools/"
+SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava-testlib:0
+		dev-java/hamcrest-library:1.3
+	)"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{README,RELEASE-NOTES}.md )
+
+S="${WORKDIR}/JCTools-${PV}/jctools-core"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.jctools.core"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest-library-1.3,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+# Using the defaults of java-pkg-simple would skip more than half the number of tests.
+src_test() {
+	# org.jetbrains.kotlinx.lincheck is not yet packaged
+	rm -r src/test/java/org/jctools/maps/linearizability_test || die
+	# These tests would fail and are not run by "mvn test".
+	# "org.jctools.queues.MpqSanityTest"
+	# "org.jctools.queues.QueueSanityTest"
+	# "org.jctools.queues.ScQueueRemoveTest"
+	# "org.jctools.util.TestUtil"
+	# Test timeout on arm64, https://bugs.gentoo.org/863977
+	# "org.jctools.queues.atomic.AtomicMpqSanityTestMpscLinked"
+	# "org.jctools.queues.MpqSanityTestMpscLinked"
+	pushd src/test/java || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			\( -name "*Test*.java" \
+			-o -name "nbsi_tester.java" \
+			-o -name "nbhs_tester.java" \)\
+			! -name "MpqSanityTest.java" \
+			! -name "QueueSanityTest.java" \
+			! -name "ScQueueRemoveTest.java" \
+			! -name "TestUtil.java" \
+			! -name "AtomicMpqSanityTestMpscLinked.java" \
+			! -name "MpqSanityTestMpscLinked.java" \
+			)
+	popd
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+	# OK (7226 tests)
+}
diff --git a/dev-java/woodstox-core/Manifest b/dev-java/woodstox-core/Manifest
index f18d7eea4c2b..a689389b379f 100644
--- a/dev-java/woodstox-core/Manifest
+++ b/dev-java/woodstox-core/Manifest
@@ -1,3 +1,5 @@
 DIST woodstox-core-6.3.1.tar.gz 6029586 BLAKE2B 04fcd7fd958cd3efa8a1e864786b88a1f8c3f0d6d6faecb5eb91a7cf755da4cef2664c0583702bf21dde741632638242131f0d46acb8f1b91bd00bf4c9a7af5b SHA512 fee1d8dc33aa2e3617b451fab285dbc91154738765eb9d93e8c1809a70f09ccb2f1cf2b70f57f836323d0a80bd5caeae0f5a4c5e2cee609c2a9d30106bf42acb
+DIST woodstox-core-6.4.0.tar.gz 6030457 BLAKE2B 0506a4af84eff8ac11bc6363581f8de737116bd254d0c3b2f68a9ce062325934188c5a05eeff918ae012330d885ba7940f9dc1afb01ee951ff58cdcd1c86b2c7 SHA512 ca8033084c0355c5a321ab51ab6cfee62737b49ab98106fab0abb3ac8950ddd773dc91d864e4e62bdddaca1b7ba98f3639d1a61d8c436892b35193a8c838659f
 EBUILD woodstox-core-6.3.1.ebuild 2850 BLAKE2B 28f9d92896a8af36c2eaa9038374cd8045a0a49e32aaf52cf86b1dfd96c71e60786698df2a080a1c6b8ede412ff917aadbe070be73aaa293cd40b42b26228fa6 SHA512 899f55fbab59ad7472a663bcd8a27565721ad816d153e15a56ff412d64e282ceea28e9255bf88df4f9b8da4baeeea783764f4e51e1d3cf209979e85be7927a08
+EBUILD woodstox-core-6.4.0.ebuild 2854 BLAKE2B 9ec76ad6cdad50838ba66e19d06bd0a8246394e831eed69c5ad9e5f618fc7e87a5b8b6084a75ed5c44f5e5595a68860941afdf604d7cfb84f9a3d56a232692d9 SHA512 8e721bc5ec7ba54b17510efd06ae646ce1117bff07a92b93a8cceb855d3503562827c741b77482efa439ec5d150bdb7dbc29d2613868f49a39dfecad2855a264
 MISC metadata.xml 366 BLAKE2B 2605af42f3dba4c792fde507b196dffd8f474581e64230e570e645754507323897bc100baae9af4851e018badcb06cb74e77725471ff3b6c28d99dd4f6824964 SHA512 9d6e03f3d734515b02329cfd788f581e88b95f3df6fcdb34884d935936034c284af861a595a7e08fad81bae4a27abb09100521d4ed0c94e39c6cff14fbf27769
diff --git a/dev-java/woodstox-core/woodstox-core-6.4.0.ebuild b/dev-java/woodstox-core/woodstox-core-6.4.0.ebuild
new file mode 100644
index 000000000000..0e7d55983aa4
--- /dev/null
+++ b/dev-java/woodstox-core/woodstox-core-6.4.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/FasterXML/woodstox/archive/woodstox-core-6.4.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild woodstox-core-6.4.0.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.fasterxml.woodstox:woodstox-core:6.4.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs"
+HOMEPAGE="https://github.com/FasterXML/woodstox"
+SRC_URI="https://github.com/FasterXML/woodstox/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# net.java.dev.msv:msv-core:2013.6.1 -> >=dev-java/msv-2022.7:0
+# net.java.dev.msv:xsdlib:2013.6.1 -> >=dev-java/xsdlib-2022.7:0
+# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
+# relaxngDatatype:relaxngDatatype:20020414 -> >=dev-java/relaxng-datatype-20020414:0
+
+CP_DEPEND="
+	dev-java/msv:0
+	dev-java/relaxng-datatype:0
+	dev-java/stax2-api:0
+	dev-java/xsdlib:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# biz.aQute.bnd:biz.aQute.bnd.annotation:6.3.1 -> >=dev-java/aqute-bnd-annotation-6.3.1:0
+# org.osgi:osgi.core:5.0.0 -> >=dev-java/osgi-core-8.0.0:0
+# POM: pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-11:*
+	dev-java/aqute-bnd-annotation:0
+	dev-java/osgi-core:0"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
+
+S="${WORKDIR}/woodstox-${P}"
+
+JAVA_CLASSPATH_EXTRA="aqute-bnd-annotation,osgi-core"
+JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+# https://github.com/FasterXML/woodstox/blob/woodstox-core-6.3.0/pom.xml#L229-L243
+src_test() {
+	pushd src/test/java > /dev/null || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			\( -wholename "**/Test*.java" \
+			-o -wholename "**/*Test.java" \) \
+			! -wholename "failing/*.java" \
+			! -wholename "**/Abstract*.jav" \
+			! -wholename "**/Base*.java" \
+			)
+	popd > /dev/null
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}
+
+src_prepare() {
+	default
+
+	# src/moditect/module-info.java:33: error: cannot find symbol
+	#    provides org.codehaus.stax2.validation.XMLValidationSchemaFactory.dtd with com.ctc.wstx.dtd.DTDSchemaFactory;
+	# https://bugs.gentoo.org/858302
+	sed -e '/com.ctc.wstx.shaded.msv/d' \
+		-e '/org.codehaus.stax2.validation/d' \
+		-i "src/moditect/module-info.java" || die
+}
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index 13ce0b49fc27..d2e19886ddc8 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,3 +1,6 @@
 DIST xmlgraphics-commons-2.7-src.tar.gz 2021218 BLAKE2B a16dda389662a38d5ebf6cbd015ac5bf8154b5e2df9e36fd3a33987b04a4de08cc1ebc71e940c05793ef045249c68e7dbb54c418a7c6888020a800e039b0a188 SHA512 7d3993fc920767512f94edef3342757f0ffc9c9dbad80695fe3d77b0ec162380d9b467682ae41238e7ee719601709edb41b2dab06c385dfd9fa898577d8d2c22
+DIST xmlgraphics-commons-2.8-src.tar.gz 2243271 BLAKE2B 86456adf4b9610e580b3b4f87c362dc1259c2f2bb4d4abb0dc3d765ee2cc5fb3df54597f5a5fa620a813dee83cd7549771d2b4116d20077103e389f1942903a0 SHA512 3e6c397a7444c4ce1d1aeda96a7c9abfd3d8d57a0997d7d6ae2be36303dd17550b7b92fd86eac832566bbeefccdd06619e31c0d907cd6b953a8eb934d7fa618b
+DIST xmlgraphics-commons-2.8-src.tar.gz.asc 833 BLAKE2B d68b6fe36b44764c44b67baca02a50f01644aaf2e8ed6571caeffd7724b6284860bd81d5a2ddcbefde6411bd5c9ed072f853cd178f862541f9f49aea3e023e21 SHA512 6e17a628ddd253c44d62a7f08d615f5a484bb6433482e6e217e794620396150b327f2e89836f62aafde3050ac0677432e0b12b645c57ae74cc11e093d86ac43c
 EBUILD xmlgraphics-commons-2.7-r1.ebuild 2095 BLAKE2B 58a8aa16af88bd0cb888efa1e79b21c9601b09e2d6fc408da27062270dddd0ed41c37c6451050bcdc05fbedbe12d89f09cb5142f4dd62cb1aa57e44135ab1126 SHA512 30e5b801298c0bce4e6aed077226fdbc9cd4c558a24046a552b5df2372926c0906a3d3f15a6c4cfe3c98ce797d60042202fe63e19c493b5a8ebfb55583de2ec3
+EBUILD xmlgraphics-commons-2.8.ebuild 2276 BLAKE2B a4f38ef8aeedd72d93fee58f51bcb262d8501237ef7268ac7ff4b79b0c84ae77604542aeaebc6989d9d00c54c71d8bddaf1458ccc10d5ddf827cd83dc13a052f SHA512 f94c54808664b3801067beae9e8ee2f29baa58cd1d728de2d1e2c290bc5965f254e2d07fe203db67c7258976cfcd9a6c600f0cd61b2406774d95a708952fa87d
 MISC metadata.xml 328 BLAKE2B 0116b6e35d9f22341807f3da68bd8d38fc43447920207a08508c46796bf1ff9d2634f38002b22139b7142c912e531d27043f629f259ab2e87d12b8e590d4b92a SHA512 74979721cdcb0c26c82a27e23043487990f41691ea1dd6acf87fb4e403dc8a44402c9907d697ac3024d754b3c504c266d51753b3cad1e4e3a16d861758574a61
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild
new file mode 100644
index 000000000000..e2a835d17188
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.8.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/xmlgraphics/commons/source/2.8-src.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmlgraphics-commons-2.8.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:xmlgraphics-commons:2.8"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="XML Graphics Commons"
+HOMEPAGE="https://xmlgraphics.apache.org/commons/"
+SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+
+CP_DEPEND="
+	dev-java/commons-io:1
+	dev-java/commons-logging:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:2.28.2 -> >=dev-java/mockito-4.8.0:4
+# test? xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/mockito:4
+		dev-java/xml-commons-resolver:0
+	)"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-commons )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/xmlgraphics-commons.apache.org.asc"
+
+DOCS=( NOTICE README )
+
+S="${WORKDIR}/${P}"
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_EXTRA_ARGS=( -ea )
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,xml-commons-resolver"
+# Some *.{png,tiff,txt,xmp} are misplaced in "src/main/java".
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "src/test/java" )
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 11; then
+		JAVA_TEST_EXCLUDES="org.apache.xmlgraphics.image.loader.CorruptImagesTestCase"
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
index 424b56387fb1..e55e7ec2ae20 100644
--- a/dev-java/zstd-jni/Manifest
+++ b/dev-java/zstd-jni/Manifest
@@ -1,3 +1,5 @@
 DIST zstd-jni-1.5.2.4.tar.gz 9343792 BLAKE2B 8a446b229d49671b3f38d630ecf2c2688210176af95b66c788027de89986ad1f23615582d670f1d7a0b3866572b05c722ad6c71783d208401844287e8149f65c SHA512 bf67fc6573f2b1e45bd4985186814a54fb948a1b7280b5cf2f6d2577626c1f70626a58994291ffb228f097c91d60e3ed52d56ad92830c8f386b96b11fb6cf4a2
+DIST zstd-jni-1.5.2.5.tar.gz 9342510 BLAKE2B 259f3087f06c567f2126dacfb90ecfcc1d20f389ff99ef48a6f8c558441b37b56f29b73ca55aad176116439c4ef47f9ad253116a968f74e527eb13a0fda98f7e SHA512 16f2aeee6005e2da366a849f0972b3ef9245d355ed875e633bf4013d340cc74445604710e7b628aefafa90f74dfaa82a93c741f06f633b8a6c2162e9da304850
 EBUILD zstd-jni-1.5.2.4.ebuild 1693 BLAKE2B c186358196b6c5425eb71ced0d9c594f039c440b73e3e013c3dab89d61d94f478535803312e6180809911dc5b7cf7114ff2446340e666538a5e67b30bd4584d7 SHA512 e5ee8352fcb398a6a6f077c7d70dc3443f62a81f665bb848b33f03fc647528f752bb864444c06da01e0d69008360c84725d3b8d146461166ce97fd84c22dbf35
+EBUILD zstd-jni-1.5.2.5.ebuild 1537 BLAKE2B 4066fc48010c044939f2474c8f0cccd5445a8d8e8ce60c64d539d1be28b463edb454c44218679c4b3edd178ec39266d584f2a2a7d3b21c5be1ea8b33444c7480 SHA512 20f772f07911619b3aca15bcb3555f45038c80045daa06b8f6ae3c55f421baf55637161afa1f8ed0f96031d9c41e5adaae0c29010228bdc5bfded3085e048176
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/zstd-jni/zstd-jni-1.5.2.5.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.2.5.ebuild
new file mode 100644
index 000000000000..c7430c949f87
--- /dev/null
+++ b/dev-java/zstd-jni/zstd-jni-1.5.2.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.luben:zstd-jni:1.5.2-5"
+
+inherit java-pkg-2 java-pkg-simple cmake
+
+DESCRIPTION="JNI bindings for Zstd native library"
+HOMEPAGE="https://github.com/luben/zstd-jni"
+SRC_URI="https://github.com/luben/zstd-jni/archive/c$(ver_rs 3 -).tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/zstd-jni-c$(ver_rs 3 -)"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.github.luben.zstd_jni"
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	cmake_src_prepare
+	# https://github.com/luben/zstd-jni/blob/c1.5.2-5/build.gradle#L66
+	cat > src/main/java/com/github/luben/zstd/util/ZstdVersion.java <<-EOF || die
+		package com.github.luben.zstd.util;
+
+		public class ZstdVersion
+		{
+			public static final String VERSION = "$(ver_rs 3 -)";
+		}
+	EOF
+
+	mkdir -p  resources/META-INF || die
+	echo "Implementation-Version: $(ver_rs 3 -)" \
+		> resources/META-INF/MANIFEST.MF || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+		# Resolve bug #776910
+		# Reference: https://stackoverflow.com/a/51764145
+		-DJAVA_AWT_LIBRARY="NotNeeded"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg_doso "${BUILD_DIR}/libzstd-jni-$(ver_rs 3 -).so"
+	java-pkg-simple_src_install
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ce4235ace5fb..78f7d7b313ea 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 1ca5a87ec08b..8d625959f494 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,8 +1,3 @@
-AUX c-blosc-1.21.1-gnuinstalldirs.patch 2608 BLAKE2B 03e7d073c0f16a651569b21167d43ba405924848c0f5e653154f13473b916d02f5a1d2cafaa3f8d195f7ba6adac378b382893ffe522058d23f9aac112fff9279 SHA512 95865129f6c2a042ad1367873c1d5c165766c9628fe0237609f741def95f44290cf99ad03ea567cca7bd2fcdf727261f4d8ae8fce5bdf96dd1450b0f59196508
-DIST c-blosc-1.21.1.tar.gz 1456777 BLAKE2B a6a48d79fc8cb3df277e878a69361a5d12552be4b8ae50a4a95d2fe48d5b073c849724913a20c2834de7cf3cac7f288ddfec977ed1e4a1875fc3d21975907b44 SHA512 e06712ffaeaa6892415a6b01219221426c20af4191db6ca923301313daa8f5b0a83a7a3cd273f7013766349ace4e4869590e9c44bd892e57027ca45de53779e7
-DIST c-blosc-1.21.2.gh.tar.gz 1528949 BLAKE2B fa1702150a8b64bb9b4eb4de963a42c89be8f62f0b53804cb81345abb6be150b4fdbf2c2a8d4f2379301c65de07564608f1e25ee1d9b045747c486ef08740815 SHA512 f976c40834c1c3a0ec5af8dfb36b0b674430053a902b2e4dcac68eec9118f022a7a90aa73447e4d8234ce819088cf19ee574c1a1ca39c2e4f9164d79a95066b6
 DIST c-blosc-1.21.3.gh.tar.gz 1532077 BLAKE2B ff8ad36e4e34b245062025c5820655bb52fea40276e88a748253d5079c3b5f8662079f177835ab38aa6e58d87e7849a93d7e1289346fcc53c077ef85b7382462 SHA512 e9542aa2d1ebae9f6dcc12916d7ac3b920d771281ab96e2b2d59c2951e5f51d02d2684859b8823643d43d320613fb9dd8a3ea411ade34e66e323fcefa8165a91
-EBUILD c-blosc-1.21.1-r1.ebuild 1211 BLAKE2B e2fa8b2b50bee2d28cbfa3c123aa7e1bdb1e406cbb38c080605ecc0f7808182807bad4b84e16ac6e70a35b6e9222d1af3fb1a0affac2c895cda17e6ce18c92ce SHA512 cfb8b5f517b9a535392cb7d3f321a2950b4924feda1b80a8757dd2ba38ebd751f43bd5c43e57ee8591022f73e2e6dcfc87a0c5571b0618dbd030a23daf7d0cbf
-EBUILD c-blosc-1.21.2.ebuild 1154 BLAKE2B 04d7644ad043a7b07437011c167cf9df73d97e2a3f7a3624eb22e19d6e9c917a74e6a7b1aa31aaa65c6eda41c685f6ce24e1bfe199b7abf6956bc84ab2c7f08f SHA512 d3dafa3b09ef83886d873632b8cda0c5429d643e4f12fdd8229365fb1184df2c915dc6dfdb27f9bb40a990979057e8455ed97f2daacc150321e394491d1c6f79
-EBUILD c-blosc-1.21.3.ebuild 1154 BLAKE2B 04d7644ad043a7b07437011c167cf9df73d97e2a3f7a3624eb22e19d6e9c917a74e6a7b1aa31aaa65c6eda41c685f6ce24e1bfe199b7abf6956bc84ab2c7f08f SHA512 d3dafa3b09ef83886d873632b8cda0c5429d643e4f12fdd8229365fb1184df2c915dc6dfdb27f9bb40a990979057e8455ed97f2daacc150321e394491d1c6f79
+EBUILD c-blosc-1.21.3.ebuild 1186 BLAKE2B ed4ea2d818c43f159c7fd41800e46c193ef630f5339cf649c81fe9b50f12a81729aa3f16a4929f5bbd219c37efd126ababcec71808fbc644d93e72824b77fa68 SHA512 c2c417225de6ca5587e7a1ffa310e9e51ed8c98c5302e14228913466fa579af94ee0285ab52f403b82665be5df9c6b1d8c6ac5611ad90192f5f796d68ac764bb
 MISC metadata.xml 839 BLAKE2B 108d89a888ba31f03eb42a0717c7c9458d599cdb67cf98940c88ff943ce2079c736b6a52ac4206d4ceda17f56ea67e52dae1c77b304d39fbb9ec249a8ac38576 SHA512 f4ed6f93992492a98499ad1dff54b3fcd14e35710e0307041e606ddfff54769c5ed6ccd3ef90a5ce7943425bcee93ea9b46211f643da30d94db88adb6be7d5f8
diff --git a/dev-libs/c-blosc/c-blosc-1.21.1-r1.ebuild b/dev-libs/c-blosc/c-blosc-1.21.1-r1.ebuild
deleted file mode 100644
index 7ff161dd1390..000000000000
--- a/dev-libs/c-blosc/c-blosc-1.21.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="https://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+lz4 +snappy test zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	lz4? ( >=app-arch/lz4-1.7.5:= )
-	snappy? ( app-arch/snappy:= )
-	zlib? ( sys-libs/zlib:= )
-	zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gnuinstalldirs.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# remove bundled libs
-	rm -rf internal-complibs || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_BENCHMARKS=OFF
-		-DBUILD_FUZZERS=OFF
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
-		-DDEACTIVATE_ZLIB=$(usex !zlib)
-		-DDEACTIVATE_ZSTD=$(usex !zstd)
-		-DPREFER_EXTERNAL_LZ4=ON
-		# snappy is always external
-		-DPREFER_EXTERNAL_ZLIB=ON
-		-DPREFER_EXTERNAL_ZSTD=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/c-blosc/c-blosc-1.21.3.ebuild b/dev-libs/c-blosc/c-blosc-1.21.3.ebuild
index 96e39b39771b..c845b48cd4a5 100644
--- a/dev-libs/c-blosc/c-blosc-1.21.3.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.21.3.ebuild
@@ -6,15 +6,18 @@ EAPI=8
 inherit cmake
 
 DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="https://www.blosc.org/"
+HOMEPAGE="
+	https://www.blosc.org/
+	https://github.com/Blosc/c-blosc/
+"
 SRC_URI="
 	https://github.com/Blosc/c-blosc/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
-LICENSE="MIT"
+LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+lz4 +snappy test zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/c-blosc/files/c-blosc-1.21.1-gnuinstalldirs.patch b/dev-libs/c-blosc/files/c-blosc-1.21.1-gnuinstalldirs.patch
deleted file mode 100644
index d90a2fc50cee..000000000000
--- a/dev-libs/c-blosc/files/c-blosc-1.21.1-gnuinstalldirs.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://github.com/Blosc/c-blosc/commit/5a2907c75ee1e43be90f58f2be7f8c856004a3bf
-
-From 5a2907c75ee1e43be90f58f2be7f8c856004a3bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?H=C3=A5vard=20Flaget=20Aasen?= <haavard_aasen@yahoo.no>
-Date: Sun, 5 Dec 2021 07:52:54 +0100
-Subject: [PATCH] CMake: Use GNUInstallDirs when installing files.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -122,7 +122,7 @@ option(PREFER_EXTERNAL_ZSTD
-     "Find and use external Zstd library instead of included sources." OFF)
- 
- set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
--
-+include(GNUInstallDirs)
- 
- if(NOT DEACTIVATE_LZ4)
-     if(PREFER_EXTERNAL_LZ4)
-@@ -342,7 +342,7 @@ if (BLOSC_INSTALL)
-         "${CMAKE_CURRENT_BINARY_DIR}/blosc.pc"
-         @ONLY)
-     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/blosc.pc"
--            DESTINATION lib/pkgconfig COMPONENT DEV)
-+            DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT DEV)
- 
-     configure_file(
-         "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
---- a/blosc.pc.in
-+++ b/blosc.pc.in
-@@ -1,8 +1,8 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
- sharedlibdir=${libdir}
--includedir=${prefix}/include
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
- 
- Name: blosc
- Description: A blocking, shuffling and lossless compression library
---- a/blosc/CMakeLists.txt
-+++ b/blosc/CMakeLists.txt
-@@ -61,8 +61,6 @@ if(COMPILER_SUPPORT_AVX2)
- endif(COMPILER_SUPPORT_AVX2)
- set(SOURCES ${SOURCES} shuffle.c)
- 
--# library install directory
--set(lib_dir lib${LIB_SUFFIX})
- set(version_string ${BLOSC_VERSION_MAJOR}.${BLOSC_VERSION_MINOR}.${BLOSC_VERSION_PATCH})
- 
- set(CMAKE_THREAD_PREFER_PTHREAD TRUE) # pre 3.1
-@@ -219,11 +217,15 @@ endif(BUILD_STATIC)
- 
- # install
- if(BLOSC_INSTALL)
--    install(FILES blosc.h blosc-export.h DESTINATION include COMPONENT DEV)
-+    install(FILES blosc.h blosc-export.h
-+            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT DEV)
-     if(BUILD_SHARED)
--        install(TARGETS blosc_shared LIBRARY DESTINATION ${lib_dir} ARCHIVE DESTINATION ${lib_dir} RUNTIME DESTINATION bin COMPONENT LIB)
-+        install(TARGETS blosc_shared
-+                LIBRARY COMPONENT LIB
-+                ARCHIVE COMPONENT DEV
-+                RUNTIME COMPONENT LIB)
-     endif(BUILD_SHARED)
-     if(BUILD_STATIC)
--        install(TARGETS blosc_static LIBRARY DESTINATION ${lib_dir} ARCHIVE DESTINATION ${lib_dir} RUNTIME DESTINATION bin COMPONENT DEV)
-+        install(TARGETS blosc_static COMPONENT DEV)
-     endif(BUILD_STATIC)
- endif(BLOSC_INSTALL)
-
diff --git a/dev-libs/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest
new file mode 100644
index 000000000000..2f41c54a1673
--- /dev/null
+++ b/dev-libs/c-blosc2/Manifest
@@ -0,0 +1,3 @@
+DIST c-blosc2-2.6.1.gh.tar.gz 2365300 BLAKE2B a3fdc8798eb70e97791b7b708ef872142d38b9c4fdb8efc6d5da2010149fa61f4115f27af630a43edd5f351cb8693fbb79457f19ccf1a518f057902b93196b3d SHA512 9f5daa59d5191784ee91deb18ed15a3b36504b05061ca8b1532eaf8e402c793944059894b277843e8da19f00af05615e0865d9fdb80decd83aa07867b0e661a0
+EBUILD c-blosc2-2.6.1.ebuild 1359 BLAKE2B 5f566be2b78e6d81611483c17874203721b7b407e1cf80bfa6cd2edffbff1c347cab2e4eb8fb88eb54ecd2c9576a3d64d7c0868e3cb7421154e1841f060d2542 SHA512 37b073b2f991da5ae7dfcbcbbd38e78aadc4a787988cccf93fc4afe3556424b4bedc5fe72609634037d130ab2ce58de2c163ab8bb18d14f9c0d9cac9bae5683b
+MISC metadata.xml 327 BLAKE2B 5fafd7f688780e7c5479d492da4943b9a95122d5c64e36e4415fe69a708f983f9463824981d771424c1c75f7236a159ef843738a0b31430ccd572770fbc5a74e SHA512 9d2aa06eb8e144bafe1c65b9c7704993633f9e1db629d77209e8c832e09de34c641d9f588cf208d8f5f65ff489c56f1e01ef573213439ba99678601d6a790ee0
diff --git a/dev-libs/c-blosc/c-blosc-1.21.2.ebuild b/dev-libs/c-blosc2/c-blosc2-2.6.1.ebuild
index 96e39b39771b..6d872919ee8c 100644
--- a/dev-libs/c-blosc/c-blosc-1.21.2.ebuild
+++ b/dev-libs/c-blosc2/c-blosc2-2.6.1.ebuild
@@ -6,21 +6,23 @@ EAPI=8
 inherit cmake
 
 DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="https://www.blosc.org/"
+HOMEPAGE="
+	https://www.blosc.org/c-blosc2/c-blosc2.html
+	https://github.com/Blosc/c-blosc2/
+"
 SRC_URI="
-	https://github.com/Blosc/c-blosc/archive/v${PV}.tar.gz
+	https://github.com/Blosc/c-blosc2/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
-LICENSE="MIT"
+LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+lz4 +snappy test zlib zstd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test zlib zstd"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	lz4? ( >=app-arch/lz4-1.7.5:= )
-	snappy? ( app-arch/snappy:= )
+	>=app-arch/lz4-1.7.5:=
 	zlib? ( sys-libs/zlib:= )
 	zstd? ( app-arch/zstd:= )
 "
@@ -36,15 +38,22 @@ src_configure() {
 		-DBUILD_STATIC=OFF
 		-DBUILD_TESTS=$(usex test)
 		-DBUILD_BENCHMARKS=OFF
+		-DBUILD_EXAMPLES=OFF
 		-DBUILD_FUZZERS=OFF
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
 		-DDEACTIVATE_ZLIB=$(usex !zlib)
 		-DDEACTIVATE_ZSTD=$(usex !zstd)
 		-DPREFER_EXTERNAL_LZ4=ON
-		# snappy is always external
 		-DPREFER_EXTERNAL_ZLIB=ON
 		-DPREFER_EXTERNAL_ZSTD=ON
+
+		# upstream overrides CMAKE_C_FLAGS, preventing ${CFLAGS} defaults
+		# from applying, https://github.com/Blosc/c-blosc2/issues/433
+		-DCMAKE_C_FLAGS="${CFLAGS}"
 	)
 	cmake_src_configure
 }
+
+src_test() {
+	# Tests fail in parallel, https://github.com/Blosc/c-blosc2/issues/432
+	MAKEOPTS=-j1 cmake_src_test
+}
diff --git a/dev-libs/c-blosc2/metadata.xml b/dev-libs/c-blosc2/metadata.xml
new file mode 100644
index 000000000000..56c6094796b7
--- /dev/null
+++ b/dev-libs/c-blosc2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Blosc/c-blosc2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild b/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild
index 6bea0509f959..fb625dc1b940 100644
--- a/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild
+++ b/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild
@@ -16,7 +16,7 @@ LICENSE="|| ( AFL-3.0 AGPL-3 APL-1.0 Apache-2.0 BSD-2 Boost-1.0 CDDL CPAL-1.0
 	QPL-1.0 OFL-1.1 Sleepycat Watcom-1.0 W3C wxWinLL-3 ZLIB libpng
 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DBIx-Simple/Manifest b/dev-perl/DBIx-Simple/Manifest
index 26e747133e61..79258cd11c1a 100644
--- a/dev-perl/DBIx-Simple/Manifest
+++ b/dev-perl/DBIx-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST DBIx-Simple-1.37.tar.gz 20397 BLAKE2B 54868347dcaa13df92028b848f56ffc9ca85c49f836f78c55de3a4eeef71b825bd7089fec6b1c7df9f9ac52b1752bedca0daa35f29e09c01d22d5518e3d95fcc SHA512 f79b26bf52db33629950bc95f6c17dd13a2af135deeaf6ff5b0570ad852911fd0d27196636e605a93e9b3d740699110f2ece7abc24fcbbfd08a2f3ddce5d65b0
-EBUILD DBIx-Simple-1.370.0.ebuild 878 BLAKE2B a3687d27808e7ef27c84a61ef8db83f201c0f9f75a499b8c48e4c66a5e5d52e905286aa84d4b04d9c6401dc28bbcb79e1bcb6658e33326484ffc60fbedf7529c SHA512 d97dcae75685a739823d075d0d35a421f218e1a426dd609fca975d90cb54b8deede2445e4b6f09a234eaa33cd73f6a43867292eabbd8a754fd3015a74b5a5880
+EBUILD DBIx-Simple-1.370.0.ebuild 885 BLAKE2B 058445450f22c07b91e29ab5a34073b09c20dfaa9623343987ab87bd6fab695699aaa202ac708e6714850854ad16b350c9329101b0ce7c15b85d73a4b31f8fe1 SHA512 b293f3be93ee545c8410e2ab5f13e532902642ffbb90f2601db99bb160897b3299a5b5f1936e459623603b2c978b83a1d1d6a992058b3a63114916079362b7e0
 MISC metadata.xml 473 BLAKE2B 7ed35d4a2182a54050d0a91c6e23dc1b0dae14cf27bfca5c009a209c98229ae4d02dffbe3606e8a113bfb600978bf387531db7ae2da3f5e082f06052eb6d7bd5 SHA512 c67426372abc4c367016d9b7e2b8071485ad39eb104e321b8887b23d6edaa9344d52ecc7f0f5f0e361668549578e10ac3f39c63ddbf5cec98deca712df4029b9
diff --git a/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild b/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild
index 3250d52c20a4..0b5c36b2984b 100644
--- a/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild
+++ b/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl implementation of DMARC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="minimal"
 
 PERL_RM_FILES=(
diff --git a/dev-perl/Mail-DMARC/Manifest b/dev-perl/Mail-DMARC/Manifest
index a65011e4fbfd..6a1b2f70c119 100644
--- a/dev-perl/Mail-DMARC/Manifest
+++ b/dev-perl/Mail-DMARC/Manifest
@@ -1,3 +1,3 @@
 DIST Mail-DMARC-1.20210927.tar.gz 794723 BLAKE2B 3b0eeed4ccc6498c0af3afe20052e9ea0b0c8ba1625b80ee7b211d7f4235a4f595f7f15862b6b79642423dccd95755047ac53d54b30a5db0b0c05a6070725443 SHA512 eef5d0fda54ea45c04e61b4b6f7fae995404978c297289e68640d0409528542806ceed9dc4c701376c81014ac5d5df25f541a789f54fd982be8c4518fbcc524f
-EBUILD Mail-DMARC-1.202.109.270-r1.ebuild 1884 BLAKE2B b33eb8e6fc19e890e4940609bc352c40f3d9f5d451b9559fbc08703a3d09a11fad5d64762b23a9cf03229a44d113e4964c45f2a1817dd0235efc007fe893cbef SHA512 baecf3c1b8e9df57bf91d2469cab448bf4d1766da7cdb4bbc07833bf581d67374ed7c9b5c3c8057e9ae69b60f44399fff5b111af724619b95ca94848f222a095
+EBUILD Mail-DMARC-1.202.109.270-r1.ebuild 1891 BLAKE2B c789d276ff3f491ddb679781c344b1d75e3a7057f77b7d8c877ed62c4ecb60b4b295c16c0204a82c6e8d94a8be78cd885e9ab606847ef4b01c3ca27ea3e831f0 SHA512 1d958019c277f9efacb998e6275a2dc8bfafa009fbd6299cd8772ce5e1db4e44bfacff0ec95030fafb5a0061084807a42b2b7fbd2d6f9dc33bdb1b73e4e01e17
 MISC metadata.xml 2239 BLAKE2B 7ce9d3d8be07ad9043047fda77be9bfcfd50fa61221b6040514e7178cc156f50e121f48f243e7c8af7e5dbd5b26c79706536fd619ec0e5ebd0289dae9930f681 SHA512 a43245d8d48cabb4b5b103168de5d2dd708bf59596a84ecddb0cf79f4e66d8003f43d97bcde808be300a5dc5cc00b39006aa5be9b1063e0dc16ef73067741605
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index e0180c2d85cb..4a81385cf7b3 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Net-IMAP-Simple/Manifest b/dev-perl/Net-IMAP-Simple/Manifest
index f7095bd60d93..54602b58aeb8 100644
--- a/dev-perl/Net-IMAP-Simple/Manifest
+++ b/dev-perl/Net-IMAP-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST Net-IMAP-Simple-1.2212.tar.gz 45917 BLAKE2B e5f7fabbc6cd36af0a07a0c0d76ad5f65c888b23748abea54ad49cf032fa860c02a18a58c65b1bbd9c60133d60550b058a5822005789727b0084261daed040a8 SHA512 0c34388e9358864f74aacdd7bb046590a4d821f025ccfdc2490db4dfe017fb5ee3dea1cae96a408ed6518cc7e3bae20fe92296b9822d62c9ab2b20f26f873e74
-EBUILD Net-IMAP-Simple-1.221.200.ebuild 518 BLAKE2B 8f4b303a5c566817ff36830d8e10b11272bd533d7d914674f40259d7acb0b4dba332a78c0a3a4d9768803b4f2baa36de62a6b3db88a567da3b0be417a2cff033 SHA512 e68653450f9b359f35124a1809384bebd7f1bbfd34302ce7c47e5e8ec90bc17f8c516a610e326e8118e9e8ec12ab9306e740b6beeb106d549a64b145375a646c
+EBUILD Net-IMAP-Simple-1.221.200.ebuild 525 BLAKE2B c4859447f71486ed626b5738a9f2085174bad08962a1b4b200173d9ee7439947354933cc45f905d215b807d57fe5a8de19b10ef7b28249d9051c9386a34d063f SHA512 f180c1673f679a9d487946ad99b6e9b7c484cada43fecd20c7fdd9716e64b875bdb0dd6771b5b96163a00ba5c082b02b784fe3ebdcaf56ae6ee9ea50d815d7de
 MISC metadata.xml 764 BLAKE2B 3e52c7847943fceec75da4c8dc20935fc054df949747cda27c34aec2eb86ed24d5302c544c1b6a25de5212863bad5d92ec4d95e329e9e4d88dbc7f53e2c1df69 SHA512 569da0be6d998733b53d597f74b7620e9eec422834b5783f31793cfefe6ee47b3e06bd3611df419e321b1fa2ee1cdb8cecce56c87bfa2975114b8ae0dcd892af
diff --git a/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild b/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild
index 4b8b9746384f..b6600680d51d 100644
--- a/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild
+++ b/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for simple IMAP account handling"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	virtual/perl-IO
diff --git a/dev-perl/Net-SMTPS/Manifest b/dev-perl/Net-SMTPS/Manifest
index 20b12c12766f..e030bfc52751 100644
--- a/dev-perl/Net-SMTPS/Manifest
+++ b/dev-perl/Net-SMTPS/Manifest
@@ -1,3 +1,3 @@
 DIST Net-SMTPS-0.10.tar.gz 5309 BLAKE2B 6832b95d40a92b8fbd5ff381967122ab8d03ae8550181b00f931e1526d8f46ea7557ec615ca07675228daa1759b7856442307305916892052f6a7d70f4a600c5 SHA512 e9d2202f63c5149ea72d8b37e27a5c0a7d0259de6a2afd7dad4b59ce00121cedb212d73c1f50d2b6ac77a0e0934bdc750fed3be4865c5f84b805befbdab802c4
-EBUILD Net-SMTPS-0.100.0.ebuild 433 BLAKE2B 0899f84d7f59f0115988f70e9f26d2d464542bddde05b4d036324d87b6f3ad73b9ea5931fc66223251f6dc97c52441cb603ed3061924e883ba73d193ebf37f9f SHA512 c6a67ccddd5335c377a9627aadad4aa67845cbbb8f8cfe502bb4d53094f5ddcbbcade9dbe6f5f6ddb385c4fa45e54586c59a0c5ef928ce634a2d1e1eca0d42d8
+EBUILD Net-SMTPS-0.100.0.ebuild 440 BLAKE2B f75668f75b097050245034afc9af693a08559f2e823f22243d69b02dcc9090e567fc09cf49b14effbf67a1410d4ed38fda9a9cc65bb06a4670f7708c41d55c70 SHA512 44fd871f3d92739768a0d863e4d60c81914c5f6e54b5acd02d762aa3611fcd521a2a4144c278061e3649c785d2651633e12e4b078f7a6cd4ca8e890ba7ba798a
 MISC metadata.xml 391 BLAKE2B 3ca0035db0ab987520e11cea275256d545570e4ea5c0137aef0bf543377fd312e6a256af0fb7ed1777de4fb9bed3acdfb2fcb558bf932088408840a2ee7dc77b SHA512 4616a8f4b40e6c21f2c5a63b5ea6dfbfc4f521461bedc90e9e9f9b60488cffff9cea13c4b533650b10a4ac08e3c32a5cafea691cfd47d6e1d3a71d34b27155e4
diff --git a/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild b/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild
index e8a27f24caaf..4cbef504808f 100644
--- a/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild
+++ b/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="SSL/STARTTLS support for Net::SMTP"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-perl/Authen-SASL-2.0.0
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index bbc2ccefb474..bfd1fb2462c7 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index ddce994aeed3..7cacca2d325c 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,7 +1,7 @@
 DIST python-blosc-1.10.6.gh.tar.gz 1570504 BLAKE2B 44f444fa5050a6198e83649973fc82d6804eec50bf79c332ed6a974e417f2a58baf09480a9bb5c5b7abcef2a961cd7bc61f962c12db625b1a7c48799ace0b39a SHA512 e283b132ebb91e7ce362ec65a1d6760e3793046371ea545a9e842372084182bcc194c3a0e1cb20914de58554063995a238ea0a129214731689e8cd5f4203d3ed
 DIST python-blosc-1.11.0.gh.tar.gz 111589 BLAKE2B 6bc5dda4e40ceb9770dd5b6e6db1fced42e257475b220bcb530c8b291bf132f61013ece5934a7d47778fdac716fcea0e6d57b7543b1cc76ccd95201cad072bdd SHA512 94c6f470b9f6e8d1fec0e44709e84582cd595291dddcd07ea174665a6fc12e029c6f0c781c8e506e95d4f9ee9fc27cbbfb5bc2789f341df3e84f342626dcfdb0
 DIST python-blosc-1.11.1.gh.tar.gz 111262 BLAKE2B cb348253a24258d2649ebc0604acbf936b8ccc2b28c42c69da2fee72ddf87eb17a24657bc5d3c0530193a60f482555ce4cc5d168a18d9c2d79a13410d40670bc SHA512 21f8a697a3a902860a6ed72233984cf00c464ec0ddde9842a0c24b1e8e5ec4dd57b872096445a873d162d7529cba5c3666ba2a3ee3f9b1b18107d9636011281c
-EBUILD blosc-1.10.6.ebuild 1042 BLAKE2B 2d3b7779dc3e9e7e79e3129bc8edd1257d780f44bb5881fc605a83a3aa3e6da06601647deb040d15c39449b5b5407805deb4e955f89bf74c522d459430ee3640 SHA512 d94ab6390fc8f9164743c21620d6a9f938cf5cad81c95ce066c0ccebafd9613e0c13d121dacb989f0bea37331de616e8c691e1047e0cce9638c6bf1ebcef0e4e
-EBUILD blosc-1.11.0.ebuild 1143 BLAKE2B df20c0359e33412df97a669fe4d4b97b557af0bcac2f1b4a7f4d35db9241cfd3878e7c98da6aca089d421e4563d8b772a0684f5acc70b78e0ad63985edf2b148 SHA512 6aad7c48c61647710bae3dc7fca077928dd45557ec28ed31e390fb4c05b9b795fa8108cc23a5f65ed2618e09cdddec3d53283fb4c705a4e832d3d963c3eb8f0d
-EBUILD blosc-1.11.1.ebuild 1143 BLAKE2B df20c0359e33412df97a669fe4d4b97b557af0bcac2f1b4a7f4d35db9241cfd3878e7c98da6aca089d421e4563d8b772a0684f5acc70b78e0ad63985edf2b148 SHA512 6aad7c48c61647710bae3dc7fca077928dd45557ec28ed31e390fb4c05b9b795fa8108cc23a5f65ed2618e09cdddec3d53283fb4c705a4e832d3d963c3eb8f0d
+EBUILD blosc-1.10.6.ebuild 1042 BLAKE2B 30cefd3a041c9b5c638cc489aaceb58cef67f1dc4d2c0b2ed0f13331c6ff05f651cb5e9a067a270947c1d2702a9f4237c6ff09dc5bfc1442d62f291ad3132523 SHA512 ed84422242255d3efddebc194a69c7860db9ae1ac2731c4d7d1b8411a426126d570e0ba03de34b712cb840a006d47ba1fe1d7564ab2e02ac6a26be47f886db0d
+EBUILD blosc-1.11.0.ebuild 1143 BLAKE2B fbdb450aeeaa031914f32df803859ab83cb422d72622028bc481c1d4c163b4e5ffe27ffc4e84fbc47e5cca6332528d2181f3e22366b1ceee6997c00eafef45d3 SHA512 40cfba9b345bdf31c5b146ae63dd5a7365c0aca4724aaf3d4054103e16971d699af385d8acdda3205137bdf563ea691fd46b74f7434dfdedcac222594daed973
+EBUILD blosc-1.11.1.ebuild 1143 BLAKE2B fbdb450aeeaa031914f32df803859ab83cb422d72622028bc481c1d4c163b4e5ffe27ffc4e84fbc47e5cca6332528d2181f3e22366b1ceee6997c00eafef45d3 SHA512 40cfba9b345bdf31c5b146ae63dd5a7365c0aca4724aaf3d4054103e16971d699af385d8acdda3205137bdf563ea691fd46b74f7434dfdedcac222594daed973
 MISC metadata.xml 999 BLAKE2B e8ab94b206c8364bc10de6e57872e6f4264927118269fe74dc040d5fc1c8fae7b3422a62c6d675b47a87168f03eec83a8ea16210bfd1f7e11920ae94844d9546 SHA512 5dec5341aa068659bb74d206ed7ffc96bc47d1128eb48827ec189be38d9112079c37a140dadc6326ba84352ccbeeac453888391920737bbf73153431d8be1720
diff --git a/dev-python/blosc/blosc-1.10.6.ebuild b/dev-python/blosc/blosc-1.10.6.ebuild
index 42cd0539a1e7..73831d084092 100644
--- a/dev-python/blosc/blosc-1.10.6.ebuild
+++ b/dev-python/blosc/blosc-1.10.6.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 S=${WORKDIR}/${MY_P}
 
 SLOT="0"
-LICENSE="MIT"
+LICENSE="BSD"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/blosc/blosc-1.11.0.ebuild b/dev-python/blosc/blosc-1.11.0.ebuild
index b7526777e9b2..613432958855 100644
--- a/dev-python/blosc/blosc-1.11.0.ebuild
+++ b/dev-python/blosc/blosc-1.11.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 S=${WORKDIR}/${MY_P}
 
 SLOT="0"
-LICENSE="MIT"
+LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/blosc/blosc-1.11.1.ebuild b/dev-python/blosc/blosc-1.11.1.ebuild
index b7526777e9b2..613432958855 100644
--- a/dev-python/blosc/blosc-1.11.1.ebuild
+++ b/dev-python/blosc/blosc-1.11.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 S=${WORKDIR}/${MY_P}
 
 SLOT="0"
-LICENSE="MIT"
+LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index c20c84cfd05b..4a859791c662 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,3 +1,6 @@
+AUX pytables-3.8.0-blosc2.patch 842 BLAKE2B 1ab97a9b0d5c5e435671c00cb8d5ab77048f9eea493a716846e7d350f902487c2098d43d194c5373ca4297f0d266b723a3d9eb59f69836278adfbb4a75c22820 SHA512 b64944a0916b7da5543b518e16fc70ead6b2f7c0bfdb79bf0e49549067464997b9906bb2b1d0d02b32abbe315135c09e64ffec91fc57b8f87117c33564684b25
 DIST tables-3.7.0.tar.gz 8227955 BLAKE2B 0d5b7b765375c4787f1210138e5fd02e3c0ce429ef209a3a8d4fd3bc094f68486ab6f4d0a960ce86efea6991ed691ef2a3e9e8f37a49fe91cb8d6372cadea80e SHA512 eaa368d063b5fad87e6d0f9ab6f02da0b2a3542740a52fe8c2bb58e41121495d07b6d2710ad402a28891294aa61a11238c6a7e2cf2933a1bb11391b79cf4fd13
+DIST tables-3.8.0.tar.gz 8014052 BLAKE2B 28d120ad609ebc9ae8cd97286bb3fb9c484bd8a179edcf0de1b96e4400b7a21b4db835d94fae3aaee84924bd46b84b84da12c538b39517362d805651e7aa3aef SHA512 1616c00787a2e88ff3dc2aebe3a1b2ad428b5a8ea48fc94058b49c509f1c040b540b3f62551b16b3246d2fed58e0b33443cbdaaf1dfcba5a6eead5f3e8028029
 EBUILD pytables-3.7.0.ebuild 1645 BLAKE2B 1878a51553ea7e069b3968ad92f7eb62490d14e7f47b5e4be71bd9d0e2a792ba1980d011d7571de014a344ea48f35ab8fcb00129f87758c5482e2d206c635f61 SHA512 db1a8c323e04500c581565125d3bbb5da9bcee9049f0b62789223b8320c743533746135169fc94b70094ee82868412eb0fa24d8ec995a3519c6aff0bde401251
+EBUILD pytables-3.8.0.ebuild 1646 BLAKE2B 525f537f398dff01949d29ab3ce4fee4ded8c50b491b5c294f2761658b67c539b690a4020dc7526b0e40b7a71c59f68c7755471e170724c030387a007382b6fa SHA512 80af2622bf243a2c0e8dfb296f9cde63ea067aaad0f5371ccd0d706935246a116d3b6c11f2ae6fc7a8fc8c4668938462e7d82430ccc13641b98f7bb0d926517e
 MISC metadata.xml 897 BLAKE2B 7723b2f6b3fb46cd11fb8c80502f472e1539f0fa16b9a73a750515c4450aa62986bbca72646c101b4171972feca60f84de8349df1282b0b03c88a319299b0520 SHA512 ad65bf568eb36d4dc85a2154d52e470362b210c12bfb5a865a884aac04c0973bffde4f345ac3b20bace2fe511c1b0cabebddc40abf928c082ebcfd6280d1c681
diff --git a/dev-python/pytables/files/pytables-3.8.0-blosc2.patch b/dev-python/pytables/files/pytables-3.8.0-blosc2.patch
new file mode 100644
index 000000000000..59403cdec12d
--- /dev/null
+++ b/dev-python/pytables/files/pytables-3.8.0-blosc2.patch
@@ -0,0 +1,30 @@
+From 99a7f336635aaeb666ea8dc791743177a030dc18 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 28 Dec 2022 15:53:08 +0100
+Subject: [PATCH] Workaround blosc2 detection via blosc2 package
+
+---
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 966be028..2708deb9 100755
+--- a/setup.py
++++ b/setup.py
+@@ -262,11 +262,11 @@ if __name__ == "__main__":
+ 
+     debug = "--debug" in sys.argv
+ 
+-    blosc2_inc, blosc2_lib = get_blosc2_directories()
++    blosc2_inc, blosc2_lib = "", ""
+ 
+     # Global variables
+     lib_dirs = [blosc2_lib]
+-    inc_dirs = [Path("hdf5-blosc/src"), Path("hdf5-blosc2/src"), blosc2_inc]
++    inc_dirs = [Path("hdf5-blosc/src"), Path("hdf5-blosc2/src")]
+     optional_libs = []
+     copy_libs = []
+ 
+-- 
+2.39.0
+
diff --git a/dev-python/pytables/pytables-3.8.0.ebuild b/dev-python/pytables/pytables-3.8.0.ebuild
new file mode 100644
index 000000000000..889a681566ed
--- /dev/null
+++ b/dev-python/pytables/pytables-3.8.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN=tables
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Hierarchical datasets for Python"
+HOMEPAGE="
+	https://www.pytables.org/
+	https://github.com/PyTables/PyTables/
+	https://pypi.org/project/tables/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/bzip2:0=
+	app-arch/lz4:0=
+	>=app-arch/zstd-1.0.0:=
+	>=dev-libs/c-blosc-1.11.1:0=
+	dev-libs/c-blosc2:=
+	dev-libs/lzo:2=
+	>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+	>=sci-libs/hdf5-1.8.4:=
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/numexpr-2.6.2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/py-cpuinfo[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
+	dev-python/py-cpuinfo[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-blosc2.patch
+	)
+
+	export PYTABLES_NO_EMBEDDED_LIBS=1
+	export USE_PKGCONFIG=TRUE
+
+	rm -r c-blosc/{blosc,internal-complibs} || die
+	rm tables/libblosc2.so || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile -j1
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	"${EPYTHON}" tables/tests/test_all.py -v || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r contrib examples
+		docompress -x /usr/share/doc/${PF}/{contrib,examples}
+	fi
+}
diff --git a/dev-python/stapler/Manifest b/dev-python/stapler/Manifest
index 18bc2b2aa098..68747d923237 100644
--- a/dev-python/stapler/Manifest
+++ b/dev-python/stapler/Manifest
@@ -1,3 +1,7 @@
+AUX stapler-1.0.0_p20220330-fix-tests-for-PyPDF2-2.x.patch 317 BLAKE2B 7000903663d5843388203d4cb4984a93c93cd1524a877df0c1d8a474805b4b85701f903ab813b0afa9ef8b8bef3faae771822b6e28522e17cda014299b933d16 SHA512 c7f35ae69db4eb5d61d63a2a56e15315444696168a080dc81d2839f815d975c2da92cdf36f39e7bd8a38958889b1f588dce38c435fcec7fc5e7cd62e3b25befe
+AUX stapler-1.0.0_p20220330-port-to-PyPDF2-3.0.0.patch 11876 BLAKE2B bcb22eece9e360e32bc6ef40ccdaac176fa6c2b265d962c52b399497f8347291f597a6a3b806fdf315937509d32b68bed79ccc580b2b4eb4789a5b7d4fbba2a6 SHA512 698cdbf12d36549c7e35c636b76e98bffe0f5b826bda8872f6a06a0cdb815bd855a63dc250a4f30aeb459d572db4fd54af81371664fd48cbf35aaf9b3f759061
+AUX stapler-1.0.0_p20220330-use-poetry-core-backend-for-PEP517.patch 1080 BLAKE2B 6342f8cc0931736aa6868749552da18d1c41656815f954826c6e9b2b1be0a18b45f8a8baac95d3e0f364c7c53ec7c6efb888a67b162134a9165f387e6d0c7824 SHA512 26b8d141dd765be117e9df42b78d79f68f1593e09420badb10793df007d031189627d2b3bab36635228a4337bb5b9c199472be41953be3973dd20bdddbffed11
 DIST stapler-1.0.0_p20220330.tar.gz 43659 BLAKE2B 10c24868d51086b37dd2d517aa84e3c3fc0b6becc7a29ebf496646bdd65494eb0c43488f725241d7bd7b3083ce5703538db3e05de9976a2e5029731fc2e645d2 SHA512 acd2dfec0dfab46b2cf6b440cba6c0db5399be2ba2194ca12530c311c6c5a8028614164af45b850061e7d22cbec33458ceff7757f1b104c722228dc2d02cae0a
-EBUILD stapler-1.0.0_p20220330.ebuild 772 BLAKE2B 2aa6b23c568e71eefa094778df9b4682b584626c1a123a6e45abde791a712a8a2779e846b6234881b5fba15c6587a183ae53593e0718969b083f3d72f92e315f SHA512 a3ee15f9f513044c3f0aca35e1cd9aa7caee4b3fd8d8c979becfc67a978945e93580dd52e4104670c7042a82f11643a3e63bfe97385260dfc2619089a78a3ad2
+EBUILD stapler-1.0.0_p20220330-r1.ebuild 778 BLAKE2B 85f68550da515ac0c356dabb10758fab37efea3eff6b9c00689d560b60079b38f37a2ea32666a40696039dbbd51d5caf8d4b5266920a2b63c61ec0cdb55735fe SHA512 aad862b317e8179a6700af6eb3e838b2d9b5fcc06b6eaa11373d42329355524106ce262f14ebaf5ebfb1becc1d520acaefe53e8487ebaad2eb40fe4a248eb764
+EBUILD stapler-1.0.0_p20220330-r2.ebuild 861 BLAKE2B 9efdd79049bb7758f55202bf183fa967c680135d5879aabd25d50e535a883945018f788e11aeddd61cbd89501397b7ffa53944ada83321e97baacd29b97e52ce SHA512 fae04dac057c79b38cecdb1004a9495b3a3665f2ffc4a6aee0f5622fa02ed2a7bb4b8b34216c289fdb5458c1bf488ace17a935110f09356d45c6a09122919869
 MISC metadata.xml 398 BLAKE2B 3c566702150e77dd0ba58f667336f57c0347422496edeb4fdd53e0f131cb966d15781a5d5b5e13211b2385e410a1d12c064c3ffe66056395b6eeeccdcca1cc72 SHA512 802c118d28a07f7fba6558aaa8f60aef0ebf137395af566e273ba1d218712d1835c74f82c5160f12d120d8776cbaf4fe7d09827a84c1a5e234fef307e0835a18
diff --git a/dev-python/stapler/files/stapler-1.0.0_p20220330-fix-tests-for-PyPDF2-2.x.patch b/dev-python/stapler/files/stapler-1.0.0_p20220330-fix-tests-for-PyPDF2-2.x.patch
new file mode 100644
index 000000000000..125b06a7735a
--- /dev/null
+++ b/dev-python/stapler/files/stapler-1.0.0_p20220330-fix-tests-for-PyPDF2-2.x.patch
@@ -0,0 +1,13 @@
+diff --git a/staplelib/tests.py b/staplelib/tests.py
+index 4d59153..447d48a 100755
+--- a/staplelib/tests.py
++++ b/staplelib/tests.py
+@@ -5,7 +5,7 @@ import shutil
+ import tempfile
+ import unittest
+ 
+-from PyPDF2.pdf import PdfFileReader
++from PyPDF2 import PdfFileReader
+ 
+ from staplelib import main, CommandError
+ 
diff --git a/dev-python/stapler/files/stapler-1.0.0_p20220330-port-to-PyPDF2-3.0.0.patch b/dev-python/stapler/files/stapler-1.0.0_p20220330-port-to-PyPDF2-3.0.0.patch
new file mode 100644
index 000000000000..91eea95ae217
--- /dev/null
+++ b/dev-python/stapler/files/stapler-1.0.0_p20220330-port-to-PyPDF2-3.0.0.patch
@@ -0,0 +1,302 @@
+From 48d6ab21369f1e71dc57890f9bf78fff66c00a90 Mon Sep 17 00:00:00 2001
+From: Ben Kohler <bkohler@gentoo.org>
+Date: Wed, 28 Dec 2022 10:08:30 -0600
+Subject: [PATCH 2/2] Port to PyPDF2-3.0.0
+
+Lots of functions got renamed in the recent PyPDF2-3.0.0 release
+
+Signed-off-by: Ben Kohler <bkohler@gentoo.org>
+---
+ staplelib/commands.py | 46 +++++++++++++++++++++----------------------
+ staplelib/iohelper.py | 12 +++++------
+ staplelib/tests.py    | 34 ++++++++++++++++----------------
+ 3 files changed, 46 insertions(+), 46 deletions(-)
+
+diff --git a/staplelib/commands.py b/staplelib/commands.py
+index d37bfa7..caf75f9 100644
+--- a/staplelib/commands.py
++++ b/staplelib/commands.py
+@@ -4,9 +4,9 @@ import math
+ import os
+ 
+ try:
+-    from PyPDF2 import PdfFileWriter, PdfFileReader
++    from PyPDF2 import PdfWriter, PdfReader
+ except:
+-    from pyPdf import PdfFileWriter, PdfFileReader
++    from pyPdf import PdfWriter, PdfReader
+ 
+ from . import CommandError, iohelper
+ import staplelib
+@@ -33,7 +33,7 @@ def select(args, inverse=False):
+     if not filesandranges or not outputfilename:
+         raise CommandError("Both input and output filenames are required.")
+ 
+-    output = PdfFileWriter()
++    output = PdfWriter()
+     try:
+         for input in filesandranges:
+             pdf = input['pdf']
+@@ -44,21 +44,21 @@ def select(args, inverse=False):
+             if not inverse:
+                 pagerange = input['pages'] or [
+                     (p, iohelper.ROTATION_NONE) for p in
+-                    range(1, pdf.getNumPages() + 1)]
++                    range(1, len(pdf.pages) + 1)]
+             else:
+                 excluded = [p for p, r in input['pages']]
+                 pagerange = [(p, iohelper.ROTATION_NONE) for p in
+-                             range(1, pdf.getNumPages() + 1) if
++                             range(1, len(pdf.pages) + 1) if
+                              p not in excluded]
+ 
+             for pageno, rotate in pagerange:
+-                if 1 <= pageno <= pdf.getNumPages():
++                if 1 <= pageno <= len(pdf.pages):
+                     if verbose:
+                         print("Using page: {} (rotation: {} deg.)".format(
+                             pageno, rotate))
+ 
+-                    output.addPage(pdf.getPage(pageno-1)
+-                                   .rotateClockwise(rotate))
++                    output.add_page(pdf.pages[pageno-1]
++                                   .rotate(rotate))
+                 else:
+                     raise CommandError("Page {} not found in {}.".format(
+                         pageno, input['name']))
+@@ -98,14 +98,14 @@ def split(args):
+             base,
+             '_',
+             '%0',
+-            str(math.ceil(math.log10(input.getNumPages()))),
++            str(math.ceil(math.log10(len(input.pages)))),
+             'd',
+             ext
+         ])
+ 
+-        for pageno in range(input.getNumPages()):
+-            output = PdfFileWriter()
+-            output.addPage(input.getPage(pageno))
++        for pageno in range(len(input.pages)):
++            output = PdfWriter()
++            output.add_page(input.pages[pageno])
+ 
+             outputname = output_template % (pageno + 1)
+             if verbose:
+@@ -150,17 +150,17 @@ def zip_pdf_pages(filesandranges, verbose):
+         # empty range means "include all pages"
+         pagerange = input['pages'] or [
+             (p, iohelper.ROTATION_NONE) for p in
+-            range(1, pdf.getNumPages() + 1)]
++            range(1, len(pdf.pages) + 1)]
+ 
+         pagestozip = []
+         for pageno, rotate in pagerange:
+-            if 1 <= pageno <= pdf.getNumPages():
++            if 1 <= pageno <= len(pdf.pages):
+                 if verbose:
+                     print("Using page: {} (rotation: {} deg.)".format(
+                         pageno, rotate))
+ 
+-                pagestozip.append(pdf.getPage(pageno-1)
+-                               .rotateClockwise(rotate))
++                pagestozip.append(pdf.pages[pageno-1]
++                               .rotate(rotate))
+             else:
+                 raise CommandError("Page {} not found in {}.".format(
+                     pageno, input['name']))
+@@ -181,7 +181,7 @@ def background(args):
+     try:
+         filestozip = zip_pdf_pages(filesandranges, verbose)
+ 
+-        output = PdfFileWriter()
++        output = PdfWriter()
+         for pageno in range(max(map(len, filestozip))):
+             page = None
+             for listno in range(len(filestozip)):
+@@ -190,8 +190,8 @@ def background(args):
+                     if not page:
+                         page = p
+                     else:
+-                        page.mergePage(p)
+-            output.addPage(page)
++                        page.merge_page(p)
++            output.add_page(page)
+ 
+     except Exception as e:
+         import sys
+@@ -213,11 +213,11 @@ def zip(args):
+     filestozip = zip_pdf_pages(filesandranges, verbose)
+ 
+     # Interweave pages.
+-    output = PdfFileWriter()
++    output = PdfWriter()
+     for pageno in range(max(map(len, filestozip))):
+         for listno in range(len(filestozip)):
+             if pageno < len(filestozip[listno]):
+-                output.addPage(filestozip[listno][pageno])
++                output.add_page(filestozip[listno][pageno])
+ 
+     _write_output(output, outputfilename)
+ 
+@@ -266,7 +266,7 @@ def pdf_page_enumeration(pdf):
+         pagelabels = pdf.trailer["/Root"]["/PageLabels"]
+     except:
+         # ("No /Root/PageLabels object"), so infer the list.
+-        return range(1, pdf.getNumPages() + 1)
++        return range(1, len(pdf.pages) + 1)
+     
+     # """Select the item that is most likely to contain the information you desire; e.g.
+     #        {'/Nums': [0, IndirectObject(42, 0)]}
+@@ -292,7 +292,7 @@ def pdf_page_enumeration(pdf):
+     style = '/D'
+     prefix = ''
+     next_pageno = 1
+-    for i in range(0, pdf.getNumPages()):
++    for i in range(0, len(pdf.pages)):
+         if len(pagelabels_nums_list) > 0 and i >= pagelabels_nums_list[0]:
+             pagelabels_nums_list.pop(0)  # discard index
+             pnle = pagelabels_nums_list.pop(0)
+diff --git a/staplelib/iohelper.py b/staplelib/iohelper.py
+index 959e900..8df365c 100644
+--- a/staplelib/iohelper.py
++++ b/staplelib/iohelper.py
+@@ -7,9 +7,9 @@ import re
+ import sys
+ 
+ try:
+-    from PyPDF2 import PdfFileWriter, PdfFileReader
++    from PyPDF2 import PdfWriter, PdfReader
+ except ImportError:
+-    from pyPdf import PdfFileWriter, PdfFileReader
++    from pyPdf import PdfWriter, PdfReader
+ 
+ 
+ from . import CommandError
+@@ -31,8 +31,8 @@ def read_pdf(filename):
+     """Open a PDF file with PyPDF2."""
+     if not os.path.exists(filename):
+         raise CommandError("{} does not exist".format(filename))
+-    pdf = PdfFileReader(open(filename, "rb"))
+-    if pdf.isEncrypted:
++    pdf = PdfReader(open(filename, "rb"))
++    if pdf.is_encrypted:
+         while True:
+             pw = prompt_for_pw(filename)
+             matched = pdf.decrypt(pw)
+@@ -46,7 +46,7 @@ def read_pdf(filename):
+ def write_pdf(pdf, filename):
+     force = staplelib.OPTIONS.force
+ 
+-    """Write the content of a PdfFileWriter object to a file."""
++    """Write the content of a PdfWriter object to a file."""
+     if os.path.exists(filename) and not force:
+         raise CommandError("File already exists: {}".format(filename))
+ 
+@@ -123,7 +123,7 @@ def parse_ranges(handles_files_and_ranges):
+                         "page range '{}'".format(handle_key, inputname))
+ 
+             current = operations[-1]
+-            max_page = current['pdf'].getNumPages()
++            max_page = len(current['pdf'].pages)
+             # allow "end" as alias for the last page
+             replace_end = lambda page: (
+                 max_page if page.lower() == 'end' else int(page))
+diff --git a/staplelib/tests.py b/staplelib/tests.py
+index 4d59153..3350dfc 100755
+--- a/staplelib/tests.py
++++ b/staplelib/tests.py
+@@ -5,7 +5,7 @@ import shutil
+ import tempfile
+ import unittest
+ 
+-from PyPDF2 import PdfFileReader
++from PyPDF2 import PdfReader
+ 
+ from staplelib import main, CommandError
+ 
+@@ -38,40 +38,40 @@ class TestStapler(unittest.TestCase):
+                      self.outputfile])
+         self.assertTrue(os.path.isfile(self.outputfile))
+         with open(self.outputfile, 'rb') as outputfile:
+-            pdf = PdfFileReader(outputfile)
+-            self.assertEqual(pdf.getNumPages(), 6)
++            pdf = PdfReader(outputfile)
++            self.assertEqual(len(pdf.pages), 6)
+ 
+     def test_sel_one_page(self):
+         """Test select of a one page from a PDF file."""
+         run_stapler(['sel', 'A=' + FIVEPAGE_PDF, 'A2', self.outputfile])
+         self.assertTrue(os.path.isfile(self.outputfile))
+         with open(self.outputfile, 'rb') as outputfile:
+-            pdf = PdfFileReader(outputfile)
+-            self.assertEqual(pdf.getNumPages(), 1)
++            pdf = PdfReader(outputfile)
++            self.assertEqual(len(pdf.pages), 1)
+ 
+     def test_sel_range(self):
+         """Test select of more pages from a PDF file."""
+         run_stapler(['cat', 'A=' + FIVEPAGE_PDF, 'A2-4', self.outputfile])
+         self.assertTrue(os.path.isfile(self.outputfile))
+         with open(self.outputfile, 'rb') as outputfile:
+-            pdf = PdfFileReader(outputfile)
+-            self.assertEqual(pdf.getNumPages(), 3)
++            pdf = PdfReader(outputfile)
++            self.assertEqual(len(pdf.pages), 3)
+ 
+     def test_del_one_page(self):
+         """Test del command for inverse select of one page."""
+         run_stapler(['del', 'A=' + FIVEPAGE_PDF, 'A1', self.outputfile])
+         self.assertTrue(os.path.isfile(self.outputfile))
+         with open(self.outputfile, 'rb') as outputfile:
+-            pdf = PdfFileReader(outputfile)
+-            self.assertEqual(pdf.getNumPages(), 4)
++            pdf = PdfReader(outputfile)
++            self.assertEqual(len(pdf.pages), 4)
+ 
+     def test_del_range(self):
+         """Test del command for inverse select multiple pages."""
+         run_stapler(['del', 'A=' + FIVEPAGE_PDF, 'A2-4', self.outputfile])
+         self.assertTrue(os.path.isfile(self.outputfile))
+         with open(self.outputfile, 'rb') as outputfile:
+-            pdf = PdfFileReader(outputfile)
+-            self.assertEqual(pdf.getNumPages(), 2)
++            pdf = PdfReader(outputfile)
++            self.assertEqual(len(pdf.pages), 2)
+ 
+     def test_split(self):
+         """Make sure a file is properly split into pages."""
+@@ -81,24 +81,24 @@ class TestStapler(unittest.TestCase):
+         self.assertEqual(len(filelist), 5)
+         for f in os.listdir(self.tmpdir):
+             with open(os.path.join(self.tmpdir, f), 'rb') as pdf_file:
+-                pdf = PdfFileReader(pdf_file)
+-                self.assertEqual(pdf.getNumPages(), 1)
++                pdf = PdfReader(pdf_file)
++                self.assertEqual(len(pdf.pages), 1)
+ 
+     def test_background(self):
+         """Test background."""
+         run_stapler(['background', ONEPAGE_PDF, FIVEPAGE_PDF, self.outputfile])
+         self.assertTrue(os.path.isfile(self.outputfile))
+         with open(self.outputfile, 'rb') as outputfile:
+-            pdf = PdfFileReader(outputfile)
+-            self.assertEqual(pdf.getNumPages(), 5)
++            pdf = PdfReader(outputfile)
++            self.assertEqual(len(pdf.pages), 5)
+ 
+     def test_zip(self):
+         """Test zip."""
+         run_stapler(['zip', ONEPAGE_PDF, FIVEPAGE_PDF, self.outputfile])
+         self.assertTrue(os.path.isfile(self.outputfile))
+         with open(self.outputfile, 'rb') as outputfile:
+-            pdf = PdfFileReader(outputfile)
+-            self.assertEqual(pdf.getNumPages(), 6)
++            pdf = PdfReader(outputfile)
++            self.assertEqual(len(pdf.pages), 6)
+ 
+     def test_output_file_already_exists(self):
+         """Test zip."""
+-- 
+2.39.0
+
diff --git a/dev-python/stapler/files/stapler-1.0.0_p20220330-use-poetry-core-backend-for-PEP517.patch b/dev-python/stapler/files/stapler-1.0.0_p20220330-use-poetry-core-backend-for-PEP517.patch
new file mode 100644
index 000000000000..276df746791f
--- /dev/null
+++ b/dev-python/stapler/files/stapler-1.0.0_p20220330-use-poetry-core-backend-for-PEP517.patch
@@ -0,0 +1,32 @@
+From 3907d86f515ff0e9f042df7111515205e9abaa11 Mon Sep 17 00:00:00 2001
+From: Ben Kohler <bkohler@gentoo.org>
+Date: Thu, 26 May 2022 13:33:38 -0500
+Subject: [PATCH 1/2] pyproject.toml: use poetry-core backend for PEP517
+
+Per poetry upstream, "If your pyproject.toml file still references
+poetry directly as a build backend, you should update it to reference
+poetry-core instead."
+
+https://python-poetry.org/docs/pyproject/#poetry-and-pep-517
+https://projects.gentoo.org/python/guide/distutils.html#deprecated-pep-517-backends
+
+Signed-off-by: Ben Kohler <bkohler@gentoo.org>
+---
+ pyproject.toml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index efa98ea..d34823e 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -28,5 +28,5 @@ pdf-stapler = 'staplelib:main'
+ 
+ # this section is for PEP517 compliance. It is technically unnecessary if using Poetry
+ [build-system]
+-requires = ["poetry>=1.0"]
+-build-backend = "poetry.masonry.api"
++requires = ["poetry-core>=1.0.0"]
++build-backend = "poetry.core.masonry.api"
+-- 
+2.39.0
+
diff --git a/dev-python/stapler/stapler-1.0.0_p20220330.ebuild b/dev-python/stapler/stapler-1.0.0_p20220330-r1.ebuild
index 4f7a695bcf35..ba151de7317e 100644
--- a/dev-python/stapler/stapler-1.0.0_p20220330.ebuild
+++ b/dev-python/stapler/stapler-1.0.0_p20220330-r1.ebuild
@@ -19,8 +19,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="test? ( dev-python/PyPDF2[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/PyPDF2[${PYTHON_USEDEP}]"
+DEPEND="test? ( <dev-python/PyPDF2-3[${PYTHON_USEDEP}] )"
+RDEPEND="<dev-python/PyPDF2-3[${PYTHON_USEDEP}]"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/stapler/stapler-1.0.0_p20220330-r2.ebuild b/dev-python/stapler/stapler-1.0.0_p20220330-r2.ebuild
new file mode 100644
index 000000000000..93ca68b5fcee
--- /dev/null
+++ b/dev-python/stapler/stapler-1.0.0_p20220330-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1
+
+COMMIT="382f1edc62296e071093a5419811a2fca9d78d93"
+
+DESCRIPTION="Suite of tools for PDF files manipulation written in Python"
+HOMEPAGE="https://github.com/hellerbarde/stapler"
+SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="test? ( >=dev-python/PyPDF2-3.0.0[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/PyPDF2-3.0.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+PATCHES=( "${FILESDIR}"/${P}-fix-tests-for-PyPDF2-2.x.patch
+	"${FILESDIR}"/${P}-port-to-PyPDF2-3.0.0.patch 
+	"${FILESDIR}"/${P}-use-poetry-core-backend-for-PEP517.patch )
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9df3204008d4..c837923c0ca8 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index 33a7ede5eb94..11abd24a9ac4 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -1,4 +1,6 @@
 AUX 50coccinelle-gentoo.el 154 BLAKE2B debbfe7a00bf6195db370b33430d18fb7121123da26f97c01703704918f977f886090abfa0b6f226f8d713bca566ff6e39fabefb07e098a2bfd7cbd64eaebe6a SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d
+AUX coccinelle-1.1.1-bash-completion.patch 509 BLAKE2B 57c4e11cf88b768b2d6be761d17642c02bfaab3081336d5fd2bd32c4329c6607a2bdbb7631fb79aed59d631af7bc233d479000e9dda6dc348a8a794b41c400c4 SHA512 fa96dd1774f8d4919f4f1b0594f9316441f2114c1d10780d57306fa8d9092e39720da88e958c1eda6c7a25c2e40fcc7de3be478aba7bad10bb112e4fa404c87f
+AUX coccinelle-1.1.1-find-xxdate.patch 449 BLAKE2B 9709570d28661b7cfea4c7931130d579efd8883e0eee4c90cd96809acf97ca67477be8a1164639c9835176dccf6353e6ca34e0802b18ab0faecc56d99b248713 SHA512 ef7117ad88f5b80675919ad583a18a0dd4a902549c6c681107382ccf06a293d8ec139c5fbb4e3c580504dceb44010b72b321a05626ea49fe990c8f47f0eea6c4
 DIST coccinelle-1.1.1.tar.bz2 2118055 BLAKE2B 7efb0c86432c88daa1bce2710acdf2f62b6210c69245b4896ea8c5e39a0b28c538d94deae6ed1544e0ced66b2baa6edf8670f5e02dad40c2d1f5562326ce23e3 SHA512 fcb83203c91dae18122cf95f7db931d2e1576559b74a7a1c664c795437904acdffa005a8b9e732c1d99c8f0ab1c5f529d143eafe79c6397d28c4879848afca45
-EBUILD coccinelle-1.1.1-r3.ebuild 2902 BLAKE2B 303eaf9e70f5a19d1e92e3aa541811fc11257d9bfe00f66e98cbbfcc4902a2b658be547332d0d356f227286e7818915451a58b8e185d4a687a2a2dcd070e1d0e SHA512 e495955e8735ad2d9eddb85127d86542ed103980dd4ebea5a86fc91de33bb23c0ec58b4d4a9eb7eab91ad466b7fc536216ad02b1d0a12aafd4d609d69aa9b82b
+EBUILD coccinelle-1.1.1-r4.ebuild 3011 BLAKE2B ef7b64062dc31363789a1b650ce443a1034423ed5a0e7b181e7c70bf967ca52628fe42f63ff44dfed0cedeba4ce380d952d311c8f0dfb139afcdc8f0273ad4ae SHA512 d38444944d3ac371c8ea615ac54cf36a1d70003526cc22fa252792350815d855d7b9ddecaf2d3192a8a5bab7c3852d60031997caeb02d5a88525b4da155c3218
 MISC metadata.xml 318 BLAKE2B 0d950c53a548409db938f27ae7e6941875f2d3260237c72fb3771659ed35e876e456e48823f2340122e68da18bf80bc4f16b58182937117977567579d49d48ad SHA512 c32dd8ca3473e147b69f305fe58412f10ba00dd939eba5fb871d366c6440cffbd623ce4922cd5879b2fefed19a3cf3ffb29bd588021e707623a32f85640905c4
diff --git a/dev-util/coccinelle/coccinelle-1.1.1-r3.ebuild b/dev-util/coccinelle/coccinelle-1.1.1-r4.ebuild
index dcca7af3cc71..da7fd00647c3 100644
--- a/dev-util/coccinelle/coccinelle-1.1.1-r3.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.1.1-r4.ebuild
@@ -46,7 +46,10 @@ BDEPEND="
 "
 
 DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
-
+PATCHES=(
+	"${FILESDIR}"/${P}-bash-completion.patch
+	"${FILESDIR}"/${P}-find-xxdate.patch
+)
 SITEFILE=50coccinelle-gentoo.el
 
 pkg_setup() {
@@ -101,7 +104,7 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}" VERBOSE=yes install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}" VERBOSE=yes -j1 install
 
 	if use python ; then
 		python_optimize
@@ -114,6 +117,7 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
+	einstalldocs
 	use doc && dodoc docs/manual/*.pdf
 
 	newdoc editors/vim/README README-vim
diff --git a/dev-util/coccinelle/files/coccinelle-1.1.1-bash-completion.patch b/dev-util/coccinelle/files/coccinelle-1.1.1-bash-completion.patch
new file mode 100644
index 000000000000..1958dbd498f4
--- /dev/null
+++ b/dev-util/coccinelle/files/coccinelle-1.1.1-bash-completion.patch
@@ -0,0 +1,19 @@
+--- a/scripts/spatch.bash_completion
++++ b/scripts/spatch.bash_completion
+@@ -34,7 +34,6 @@ __spatchcomp_1 ()
+         done
+ }
+ 
+-have spatch &&
+ _spatch()
+ {
+     local cur prev xspec
+@@ -89,8 +88,6 @@ _spatch()
+ complete -F _spatch -o bashdefault -o default -o nospace spatch \
+  || complete -F _spatch -o default -o nospace spatch
+ 
+-complete -F _spatch -o bashdefault -o default -o nospace spatch.opt \
+- || complete -F _spatch -o default -o nospace spatch.opt
+ 
+ # Local variables:
+ # mode: shell-script
diff --git a/dev-util/coccinelle/files/coccinelle-1.1.1-find-xxdate.patch b/dev-util/coccinelle/files/coccinelle-1.1.1-find-xxdate.patch
new file mode 100644
index 000000000000..0b8143f29cfd
--- /dev/null
+++ b/dev-util/coccinelle/files/coccinelle-1.1.1-find-xxdate.patch
@@ -0,0 +1,11 @@
+--- a/docs/manual/find-xxdate
++++ b/docs/manual/find-xxdate
+@@ -9,7 +9,7 @@
+ # Otherwise, a warning is printed on stderr and the script returns 1
+ 
+ file=xxdate.exe
+-directories="$(opam var hevea:lib) /usr/lib64/hevea /usr/share/hevea /usr/local/lib/hevea /opt/local/share/hevea"
++directories="/usr/lib/hevea /usr/lib64/hevea /usr/share/hevea /usr/local/lib/hevea /opt/local/share/hevea"
+ 
+ for dir in ${directories}; do
+   fullpath=${dir}/${file};
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index d03f2643f39e..ad95092c10d6 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,4 @@
-DIST spirv-headers-1.3.224.tar.gz 436938 BLAKE2B a0b1ddeb89a20a9ab3fa9dc0af9574a207fba2b7ff0e588678b33e1d773c19d09ce828980f9bd7956a94d1d7b6f1f138b3b9d48b45b7b307c6ebc37962f8f8ee SHA512 fbf776a3ef1db2e7b33067b3f36c1d4189ff3d89b73058374c5020c048931f88b798b84a89209b2bee419afa56fbf9bfe9df6a7387198778b8f23e79597cb057
 DIST spirv-headers-1.3.231.tar.gz 439643 BLAKE2B 034f3ff56a36dbd62290980f55ead654af209eb23359b541b6d6de72f8c6dbd67d7e0ca5c64f0e2b2f29077a19b224909c507d373a17b76010862df3222e8a08 SHA512 227d0ae49d3095813cb48b5657858df4caebfc4c711b5d8b1d358f4b37f40b482d4cc7ca4d91cb029c32c8ba6af73221ba0fa02724e795a46dc324f2bc832ff9
-EBUILD spirv-headers-1.3.224.ebuild 490 BLAKE2B c201f868fb03e46dee492548ac8d1997912eace7559d041dab2d15b8a7b5c46285d906930df30dfb2e629a1f89a9be2605aa0ec53719cfdd20edd0e6fd607726 SHA512 4a8e6249a2909bb240faab351d9f5a205c22281ec595ef151eccb5a0250a9c3cb7ad4902d998f59bff7b1a7a9a963063ef6e95f2a88f13942865a6c856ef6961
 EBUILD spirv-headers-1.3.231.ebuild 490 BLAKE2B c201f868fb03e46dee492548ac8d1997912eace7559d041dab2d15b8a7b5c46285d906930df30dfb2e629a1f89a9be2605aa0ec53719cfdd20edd0e6fd607726 SHA512 4a8e6249a2909bb240faab351d9f5a205c22281ec595ef151eccb5a0250a9c3cb7ad4902d998f59bff7b1a7a9a963063ef6e95f2a88f13942865a6c856ef6961
 EBUILD spirv-headers-99999999.ebuild 607 BLAKE2B f94f54dc76cecce5116f6840334c3dc2b03c9b7e447765c491777562dc76cb94d2da530e4b678e7d2bde5b8b164b7aaee4421d2f05fde27c18c95e26e0fed2a0 SHA512 93a76d5a2dcb393607f194893ab1edeb28e158c22806a6bf144b345e368e57611f3114d2ad3d7b352d2c941b70ddf042b2325ed018e3cc9c4b4c5a2f7f3bde3b
 MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.224.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.224.ebuild
deleted file mode 100644
index 7a7c95b03c13..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.224.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="sdk-${PV}"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 15fdc79606c1..c7325ec5b4f3 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,4 @@
-DIST spirv-tools-1.3.224.tar.gz 3033611 BLAKE2B 806c1de27d0c8dac4991dbff321fb8f62647b25b5c87d66b2f924449599e37e85ace876b848afc2e16e42f943f413e0eb759983cce95d826952809974dd9ac7d SHA512 1265db4c15d4d6c6fcb201bc958386e9c910386a82ff595b5d5f84dc03f6ab7f70f67fd59a90ffa92533b02d809305334c06228b869151cbcfdee529e90e7bbc
 DIST spirv-tools-1.3.231.tar.gz 3044417 BLAKE2B f59afde3ec653e9ed0e8c43814e2ec8e9e379d3872c5f277215948d57ff4dc29374525e42fb5cace08d59c8322c28a9077c3573691242c5aaf4b057865ed7cf1 SHA512 d38ca24b9316e9e878f56e63a08ee40d7cae5aa947546f4d9e789d71b81d0f551fcafacce09d59e9874e284705f55f98e5fdc0acc27ec429fab02f9762e47952
-EBUILD spirv-tools-1.3.224.ebuild 1220 BLAKE2B a3b228a72c7b083ac0cc7fd79b4807c15ef2a1c8ce95f063ed7363bdfd18cc0fe69aa33562eb8cdf0191964acf678260605a75c70041cfaf319f3e3fbee122c2 SHA512 2876f5f2b8a2cca96ce2816eb3ae813fac348d9b771ee6bae0f916f72ab13caf45c46a306c2977c43c7ab9db985e23f65bda0abff181d2b589a43e561f151376
 EBUILD spirv-tools-1.3.231.ebuild 1220 BLAKE2B 96dfaafd75bc5e5160b7c8e170f2a94774e810e00593265badea7658bc6bc0183ba24ee894a0e0fce8d94d5c33f003fd6418b02246354ec924d5c39a64b6137d SHA512 86d1b8636bf23f4239e013bbfec7bdef228e1b94c4b91d520483cf7be75cfd6b91c2b1c8525cd7821586e02efd2de77adc6d743f8ceeb0090cf2a28cee10c797
 EBUILD spirv-tools-99999999.ebuild 1228 BLAKE2B 14e6632663e0d507cfc0734669fcff523de12e8cc2d59e9d393f5f5fd7f497d583bc45fd163a8846b87d299406f7c1522c43d87359e8c3e7339f6238739002bc SHA512 f27542e6f9d50175e25ee80bb51a9c9dfab57746b76d225bab006803f8a21d79474beb05bbab1868ef6e52f1a8f74bfd7c2bc95ebab2aae788525ca869331cb6
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.224.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.224.ebuild
deleted file mode 100644
index 6f5263e9dd52..000000000000
--- a/dev-util/spirv-tools/spirv-tools-1.3.224.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=SPIRV-Tools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="sdk-${PV}.0"
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
-fi
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-COMMON_DEPEND="~dev-util/spirv-headers-${PV}"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
-		"-DSPIRV_WERROR=OFF"
-		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
-		"-DBUILD_SHARED_LIBS=ON"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 792bf8399254..a702fe091c88 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-headers-1.3.224.tar.gz 1521365 BLAKE2B 08e6e1badb473dfb760e20ee8a60f83cd288f33c4ad136026d2aecf474e1da13008691453886ee092e87cbd2ebbbbcf6bfcdff963276bdc8464521e07551ffa2 SHA512 856d80869267ba9c934400313cca1f9af67c1169974d70d21aed7469a39bf6d1821a95072a81edf8cdd463a62d766d478ee1c28bfc0f17a45b55ebd1634b9984
 DIST vulkan-headers-1.3.231.tar.gz 1691630 BLAKE2B 321ad1d472a80ec31e0bbc80e8eb79ef831a385415e216b2ddf83014fcf4c3fda804fb8d085be10b35bd9454ab42cada4bf3d7f25d3d854cd607f7afd8ace906 SHA512 3d460c2e768de02f8bf5ad2963c4c75c4efe03be3d6a5a752c54676307fc2913fd765c7955bee4da42a9f9c64c20b984ffde805c3561b4e97d2b4120049e88ab
-EBUILD vulkan-headers-1.3.224.ebuild 629 BLAKE2B 1bd403ce0eefd80fce8a633e99222321bfd5cbd6cc29ad5d53e22c94aa04214f850be41d314d396696f64ae1d360cc2cfaac878c2bf5f2cd03b41bf715a649d6 SHA512 7916ac21e93195e7ffab10a2def2d905ba91aaec0cf0f63992028d48ccf332f65ccb4948a5b4cd12260d217c3c08f892423b466efe5367319b3676ffac217f8e
 EBUILD vulkan-headers-1.3.231.ebuild 629 BLAKE2B 1bd403ce0eefd80fce8a633e99222321bfd5cbd6cc29ad5d53e22c94aa04214f850be41d314d396696f64ae1d360cc2cfaac878c2bf5f2cd03b41bf715a649d6 SHA512 7916ac21e93195e7ffab10a2def2d905ba91aaec0cf0f63992028d48ccf332f65ccb4948a5b4cd12260d217c3c08f892423b466efe5367319b3676ffac217f8e
 EBUILD vulkan-headers-9999.ebuild 635 BLAKE2B 6aecf86175de5bd7199734da984a00c644ff4601fdc56da3937bf4c3bcb0025302b9beae478d32f4a9cad0a7d5de751efd3caf6d31bfbcfbaee022c9e2f26941 SHA512 e740f8b3d7060f8f73eab968b43db0c0a9144cda4863cc7fa6661bd32562f36adc7a4fa00c7074551e5c3f44288ecb4b2b1204034725bb27b464bfe025a4073f
 MISC metadata.xml 432 BLAKE2B 04c6e302b541f48dd20c84c7da9e82cad1b53d8040e796034992e8e110e3a815acc76e3067d12ce12fe2d7501d797b1e0340231d7f8216c4bf7576a053f5ffb7 SHA512 89ef7a8b4de02a0726aacaabc87904bd4f5484567d21ec6dcfa15dc7f84a3a3915a3202febf4f779fdc54762b3731cd0384235a7908c46b1adf3cbc38effa5f4
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.224.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.224.ebuild
deleted file mode 100644
index 767fada760a0..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.3.224.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Headers
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 70daa0cb18b7..ccba329cf390 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-tools-1.3.224.tar.gz 868481 BLAKE2B 464e923f1bd7f72b0c9fab1ba6afa0aa179355f0ebd17c4cd6eeaf84b61efde61c60ce982d0eb081f88a64659dc5676eba77b9782e00df9d9214594806699d98 SHA512 89d2fddaaa710c78020e03b133c947afd79e9bfd1b4de711e5ac8f3e3bd5486e75960dc5a5cb7722ec55a6973233ca8a438e19627b59aaacad1c54040fdd6acb
 DIST vulkan-tools-1.3.231.tar.gz 876613 BLAKE2B 5c57e5f1f101d79b2bc57a7033a438c470db0d089beaeafa69865f95f14a55c0f71fcc0fb0dea1d898ddcdb80364abb883805e6b60f488a2b5b56bb42cffd4e9 SHA512 b6b1404e3d77e85c5f5d7e111193503e9b2a409a506692a862fcfc01a57d3ee5c6410f47dc7175175b817a1f0e9af62b7a99934c33c68f90babd698aeaeb0b8f
-EBUILD vulkan-tools-1.3.224.ebuild 1946 BLAKE2B 8112a58006428329551368ecc8e628b030a5c9d10b7038266a7e6643009c46b0132719c1deab56d9f8c4c58ebe716f5a979df40e4b99d592089550d1392a158e SHA512 f22187590f9f5702d52e58d5e3658233a769e9cd355a092b722cdd9039d939313f8b151716a233ae74969a29098ae878f3aab69bbf2f9ccb3a54b20b5e40cd8a
 EBUILD vulkan-tools-1.3.231.ebuild 1946 BLAKE2B 11081633d2d16468a477c2394b9782d95897412adeceb885259c8b59abd21cdc3e6ae86835b6d357bb8f0b40dddebfc708bac3f2ddc48426554e54c0230f1b22 SHA512 52b41f44269b5bf16880c9ec5bd4236b49a766312d8d980c98bfc177d53e5de9ed9f0cdaf37d039c71ccaff5546fd3a5f09a850a8aac0582548c27a7a36ae232
 EBUILD vulkan-tools-9999.ebuild 1951 BLAKE2B 6a7cd950fe0ef6becdea897357f8e02440db2ae4c426ac2e5bb7ca139cc5b194545d082a09230c08fc4e3f3613f89cc0da74f60c9b362fcb072cce42c79a834d SHA512 190a32fb9346c17850fb8c741432990a16e8877cb797e37b15989395e06e708a990229dd9637244de5dd5e8d4e5a02404718b4c4ea6a1461c272c881afc4fb09
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.224.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.224.ebuild
deleted file mode 100644
index 8fdda43a61ac..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.224.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Tools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cube wayland +X"
-
-# Cube demo only supports one window system at a time
-REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
-
-BDEPEND="${PYTHON_DEPS}
-	>=dev-util/cmake-3.10.2
-	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	~dev-util/vulkan-headers-${PV}
-"
-
-pkg_setup() {
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/vulkaninfo
-	)
-
-	use cube && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/vkcube
-		/usr/bin/vkcubepp
-	)
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_VULKANINFO=ON
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-
-	use cube && mycmakeargs+=(
-		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
-		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 129de9f9df12..e9d6999208c5 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 8a43df5aa5f8..6a30eb1fa0ce 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -13,5 +13,5 @@ DIST Mail-SpamAssassin-3.4.6.tar.bz2 6166807 BLAKE2B aa25c9e81f570d35e8594ba6d6d
 DIST Mail-SpamAssassin-4.0.0.tar.bz2 6371055 BLAKE2B 86f2167f6250a10a6bf871cc291f63ee9ee2d853b4183a637b4267e6979209196155be1b26e5e5b1093cf63841f9819a249de65e7002414a7e790ee1b67e5206 SHA512 a0fe5f6953c9df355bfa011e8a617101687eb156831a057504656921fe76c2a4eb37b5383861aac579e66a20c4454068e81a39826a35eb0266148771567bad5f
 DIST Mail-SpamAssassin-4.0.0.tar.bz2.asc 833 BLAKE2B 44170d411d9eb656d67bf4080807ad3c3fd9eff9f2eadadadbfde828e542bc57b5cdcfb062c7f210be4d721bdf9cf85aec9b1fb491076165453b000b47990f0d SHA512 b87a80d2b0b802f52df75e485878c53cc4fad52935ca2b14b1b06e46d334b52c673e66d61cc2155b5e812fa6a486f8e61f6a87794be2524acea1fd8ac42e7d6a
 EBUILD spamassassin-3.4.6-r2.ebuild 9839 BLAKE2B 3cfc005672dcf0ef16ad03dfe7316555b8623fcd2ef3a7a89f4921bf99da3a90e73b090207936091d467dfcaf5b956f27c2844fbca0762e25eec40aeb2aeef45 SHA512 28d27a5e1a14f9f2559731508c0c6114a3c4741e32c86a617a065c686ce094fb3c04c3372c3d87e24c7bcfbdb1421474af3af2966593066735c44dfd32c67b40
-EBUILD spamassassin-4.0.0.ebuild 10103 BLAKE2B 57d73d22f1d62909a54d022d75995547020e3f740f039aec12cb70d5f3e7c72d4a729bc9b53f2ff947f473e0afe92d0dd73a1cf58bfae45679f970a70f2ecb75 SHA512 91c9ef64000e79fc925ef6f9466cb6b885d5f12028c36e5ec16f8e745acfcbb038cea36435bc6eeabc3d1081b17f6043f11b921f5e5bea424fcc489360774560
+EBUILD spamassassin-4.0.0.ebuild 10110 BLAKE2B 3ce46ff0f2181c1caf71380cf11d26382a3c2701081132de19ae6935e7d3e27ad5d0ee1d284717aac0f5101e4c277365e4c9a1bedc1bd0660a539b4f4b7123b0 SHA512 3040cce1c2c8d219b2659cef7bde42155481d9cc35301b15163f81b2cd351a1cbf23bfc366b6a53aa517ecc19c26b9057c8433a3c5124988d0431794c6d27b2e
 MISC metadata.xml 698 BLAKE2B 09a986c93fde495aceb1370ed7440e2d141d83a3b631e050d09571441637029d5beda9fed264d6d65fe094c99fc27c91a6ba350f55d6aa6136c484b2acbd874b SHA512 1bd90e2b4339e685ebc4af7ddd6f371cebd566610fe8cc256c5bf3d120ae9bb527da633c38fff9a9e1dbd7b4949ccd78dab6cb1016311ee23e143426ed61e515
diff --git a/mail-filter/spamassassin/spamassassin-4.0.0.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0.ebuild
index 1799185e12fa..7cbf5b0773e8 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.0.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index f4afa74f18b9..c8834db428a1 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index a6a8275f88be..28989e3d66a8 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -7,7 +7,7 @@ DIST prusaslicer-2.5.0.tar.gz 48591956 BLAKE2B e353e30d91b5bb60d8885783fcba8e5fc
 DIST prusaslicer-2.5.0_alpha2.tar.gz 48053741 BLAKE2B 161462ee4dc061ee1816c165b0e85688bcce1ee010451f3d6d724a71526ccea4eb006c9610124ec006ff19b030af2fcb74993016658069222d98152f29660c7e SHA512 8c29d79349e834df284374131659b863d1df592ee5304f2bae7cdbe1825feac465eaf78e0932d4184f4077a44d6add3194db31f12c5202cb064020fbaf4beecd
 DIST prusaslicer-2.5.0_rc2.tar.gz 48596343 BLAKE2B 41df2c34929ee6797604f87d5444f252c6f751cef1de2f5275b67d675217ff2fe7bf98ecad3a551528be1f18bf926d3660cddce2ab07911a3f8c154499dd918e SHA512 94ce4b335cc89ce7c8949cdc35013bd6166ed09aa8bda556328630d7977be5d293e6ba7a143af2d1485ea7a6f6b613514ed874287793e7edcaba3453d63e37f3
 EBUILD prusaslicer-2.5.0-r1.ebuild 2004 BLAKE2B 61e4097dcb70885bb9002899bbc322133f0aa2ed67c212367866b3d69614cd2d8e60d269781c4cbe2b2de673aea7ab66d8ad9e6eb6eece20eb4e93e8854095d5 SHA512 771a01d860257896b7e87eb718fa761b10bca59a477abf85e9792845f4ddef16622688a3b4872457957dd4392e219846c7537b072b39427caf22575b0880d349
-EBUILD prusaslicer-2.5.0.ebuild 1932 BLAKE2B fcb64f0b0f4b3c7fa756b6d2f6700849a962f70914bae276b06f735483778dd3e332417ee6a16fd34f35c7b069b022565e34696ac13c18cd66032e76536c8061 SHA512 ba6097e3d532d2ec57fa043a136195fc79eee5a2361ef6430e1d0244e888478db2d0fddb9924af3928aa6c83d238ac288d4f87ed9d51f3d3442cf6a9b05fb0ff
+EBUILD prusaslicer-2.5.0.ebuild 1931 BLAKE2B 67b03ef80e8e02af21cd35768005399a83b93393f5a293e360126e609d29ebcaa7714d86a9d987d3e530335d0b39bd3105d719d5dabd041cf01c224063833cd8 SHA512 ee47e592dbb317ef6539175e5727b26e3c8313234a26bf73acba65efe8a8860ac06b41737289b8f7171c71570b12d78ae9553688e7488dbe198eb03cdb2f1ff9
 EBUILD prusaslicer-2.5.0_alpha2-r1.ebuild 1732 BLAKE2B bae5a2fbc6649c0e7508e51af3626273bac81d0ebb59feec20163bf71bf13e4a6a78d8c2dfd04d0b1e07544b05d70fb56dfd59c72ea50de4c0ae1b961134260e SHA512 df6f53be75ce105c990c4f8320646e5dfd9577aa08b0bcb04e90226138bc7ab69b7e3e9d22f805cb00153185cf23054a76a0c78d71266db4d65e6fa8bc766f29
 EBUILD prusaslicer-2.5.0_rc2.ebuild 1950 BLAKE2B acfa0d7285f0d7fdb878be0387a6f4c42a7a2472b532fa3921baf77885f63aab64d321f723d3d3af95b0365dcfac250967429babebc158eb8102b31af72d08e0 SHA512 e3653c4f6ea2dd06d63424bb656f043034ee74c46e3b5d47fc6f00e18f42761b9f6cd6240cda10e02eead03e479cb910142903109ba8bffa2b4fd5415ba48160
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild b/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild
index 394c4b628493..0340bc2f5bbe 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_P
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RESTRICT="test"
diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
index ac6179e52141..0927a14174ea 100644
--- a/media-gfx/superslicer/Manifest
+++ b/media-gfx/superslicer/Manifest
@@ -1,9 +1,3 @@
-AUX superslicer-2.4.58.3-AppConfig-include-I18N.patch 396 BLAKE2B 429dc3d1699b53d2e9c33e6240e3bfa2d6bd65ebd693d855b372f1fe0616f80ffe360feea886ea4bfd23e625fa851b38757d569a397e4e781bdd17760431c3e1 SHA512 f1910e32317122112130ce05793e0df038c99c06639098f7949af7d7f4f1097a1101bdc764e68d5ad3c3f5892fdd7865c1c19b23366e29da4ead0fa04877ee8a
-AUX superslicer-2.4.58.3-CreateMMUTiledCanvas-include-wx-rawbmp.patch 406 BLAKE2B 2879144cd04dc2a3478aae9d5922ac99b7a3e503d37a7900e7eb52094303fdb98415b51d1c20e4c5887da2b22c761fa6988494954d9261a08811b5cdd3e6a594 SHA512 961a9fa654e2336746280ef6b1d879089ee43cea802efd5c11ee8fb1ce98ddf8091005bc5a0a10e047d497c0103f7c0f925f57a54c029e6a7dd1ee60a603ee4e
-AUX superslicer-2.4.58.3-boost-1.79-port-v2.patch 9044 BLAKE2B cec6f33857de0b304ee32d859db17366ae14d11a43f2a877e81c95c7725bc928c4207bed615f3dc55916a713966f9942f78fab79a266c45eef5ed99bb4032dda SHA512 b060637758101fd2df07be493e37a0f1eeef4416ea51f43dee31d657aff8066fb3f60e767ee3d5f84d248f9a1fb72ce0065c2f081d6c4748f9da0eb4f9fcb350
-AUX superslicer-2.4.58.3-cereal.patch 2628 BLAKE2B 26001908801db3c7acfa12eb0e37094818b57577c99f90579e15b93b0e2aa796345e6facc807c929ccd63d566ebbf0497dbaa8bc518a397a0ac68e03d53763c3 SHA512 0f8ed92d5662bddc0ce09cbdd8c67736957febe317753c5111b9cc7dcfe99335fa4eb722e03940951b89c82d2d237898716cd66d2d2e54cd250b5c872047a48f
-AUX superslicer-2.4.58.3-openexr3.patch 2357 BLAKE2B 0d8c889817aaa7ddcdfd9ee434a668ce56b8c6906d61e73f118d8d37ef6a86d1315191956316e7d459629a9e60291ff86f0915bc5a877722ff99f8ce55af0351 SHA512 d3516333ce841b75c4da4f178e6e099b18fe64254484c286ad5b71d284407aa2e9cd4187b4c192b7ff3557170c0cee818d252b1c11e6b09263f9c2dc216e8aeb
-AUX superslicer-2.4.58.3-wxgtk3-wayland.patch 485 BLAKE2B a6a12b7b6b0da28593ee417e45bc97d9c297ce40b8f4a3adb3defa237ca4849238d82f58b4e8e7a4432d3167613845dd828db37529db6dbc9626bb89aa29437c SHA512 515c9b4b00cdfdc268febba8614fe9d2f33c5721ab17935a19055a25ef870ec04a51fc9af801f159dd48fb1a2d882695df373ee3b28dc676ac50f0fbaf73d474
 AUX superslicer-2.5.59.0-boost-1.81-std-wxString-to-std-wstring.patch 2581 BLAKE2B 8c2ec83db05e97949aa9fb43d3980748be1324cb2ac90c8caec45b772fb2bad34f56365381bb371d0094079b42065a65c00595388ec861e127b846e6859a0281 SHA512 6f454745d8f84dbcded092a1a16b2903757b36d76888a4c40e1f019f75ba6bea9b245c980347cc7feb0a9bdd22e8eb4e4b12e639594f1fe6e928eea5298081ec
 AUX superslicer-2.5.59.0-boost.patch 9423 BLAKE2B 8e797ed961fe2c1c8f0b5e67b6aaee8efa17933cecd190b1623e7df4f2724edb4e1c6559a839c4dc1d3b67f8f9db080476640e48187a03ec0541114863cdffc6 SHA512 f72eb91230c0e3aa2254533e5377a6aedcd806529c0cf3795eee883d4b8aaf6c618c7f2e064e80de3f688bf9f2a97d913e72d0b1c227d64caa7585cad1c97a84
 AUX superslicer-2.5.59.0-cereal.patch 1974 BLAKE2B b28be995a1c258c1848ad78a00061c73ccb173da0f790573273123f8f1481131a75ec3fb84fd8cee26dc7cef750650c827b39b685343d9defd44edec48e698a6 SHA512 50510b349f43354da7a5712d662b94a0276081c9af28d04b8d63885ed0053b52522b686ecfffa45d0b197097ee7c08ea1c831f0995a337c44becd453c392a539
@@ -12,11 +6,7 @@ AUX superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch 690 BLAKE2B 410f712603346
 AUX superslicer-2.5.59.0-missing-includes.patch 1225 BLAKE2B 0d9cfbd9dfaf6e066a4206ff7bfa88cfe92c96e102ac2105a4a4fb5288b15a878969bcd00719d89a917fd3216b42aaba3688b6ad8a6b597eeed58d4c6a26de05 SHA512 cee42f67820a0fb98f1bdbbdf160bafcfaf1d1f87dbf85dc73781e8911b4ee76697996bdc23b9acc2c502701053587ce3d9a71d301ccb2bf9ee27e010a8bd855
 AUX superslicer-2.5.59.0-openexr3.patch 2361 BLAKE2B d351d05190977e55047504d13ab4172c7eaf7fb2077a61a448dd29a8a27084ee4b13284143102b7ea3dff0edc8b20675dff0014e9f26cd5f448e50c04a1d6779 SHA512 840e51b8feb3568ff46d309ece063f7188018fcaa43d19ec50ede408fdf2c237a3b7eaa11ba24409d8c3f7d6f5fb270181508cc56e0b2b0fef68b766130ef1eb
 AUX superslicer-2.5.59.0-wxgtk3-wayland.patch 489 BLAKE2B d801db8b71aff816c3703628beb2e90d06ec4d85b982cd137e005eb4542aae308140c21b3b6fb1c72c07dd3e90e38668d6c2a69df054bdd414c43b9f8fcea57f SHA512 495d8d62c8cdf4ff9a075366dbc2db5c80a1c99bcd23172db9cf64dd649d70acbca44182722a71d790feb84c9a67a81403d75ff33b77444a1251b1f45f7b4b9e
-DIST superslicer-2.4.58.3-profiles.tar.gz 15322406 BLAKE2B cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939 SHA512 bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76
-DIST superslicer-2.4.58.3.tar.gz 45203382 BLAKE2B 822af2a1cb8978b21f8efdc0eb4841ec1d86517fd07782a8dfa6be2a58514dc3e772221dca40ff62808cb798fc4f51484b24e847328a7a6f154708431f0c4d3b SHA512 00302fba9ada1cc5df3c58f42fdb7f98322f94de7b78876c6a54a2229ae289e785082ea7a69f67bee54321fc4d97811675eeb70932e5774ab78ca8859343dd4d
 DIST superslicer-2.5.59.0-profiles.tar.gz 15322406 BLAKE2B cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939 SHA512 bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76
 DIST superslicer-2.5.59.0.tar.gz 45360646 BLAKE2B da65610270ed4c7d55b5bc495d9970812af94f424345088782b3a45b97fcf0f4b58bdc0417b89ed49e21d8c250535baa7cb74344f43438fbde8daf1b3acfacdd SHA512 1d2c0316c91bf0d65fb366806e9ea868bc93fae33deb580a324ce065fd3789ff1b600e9ace400db4988b371b1c36ef0c3ea2b52cde0d48984f312dd8d7ef3a1c
-EBUILD superslicer-2.4.58.3-r1.ebuild 2105 BLAKE2B 20cbba8ea3066567c4878e56788455d03799b7d00172ade89e476fdceba1ae88d025ed08b818b1ab1867d892ff353b49343a6d121a5d4af4930c09efbcb582d4 SHA512 9e983deee4597c285aec3cd7e359df9792363763524b8983faf2d03c832a72efa0caa5450570188aeb8be3504ef2b910fe3e2620fa02fa4e6907d1a2440ce327
-EBUILD superslicer-2.5.59.0-r1.ebuild 2130 BLAKE2B 701f37cd47ba8f95c96d8e1c78ba3f6874e8a1805f5043bd5d30f2dbe6efb61056dba653ce7e4add0ca03ab5d11b46d806e218f95e7e842a5d0689000813b8ba SHA512 91e7fc8bfdfc1dc1f20060a27ea4e6f99fc48e33cbede293cf1d594124cb6c93c8bc9c3c9da6affaa127420b128dae45ff375400a1d8e2e9c5b35af8ad49534e
-EBUILD superslicer-2.5.59.0-r2.ebuild 2195 BLAKE2B aceb6d93d5db050312c52047e18f1a5ac3da0aacbdd0f07830b04c4d5a21aaefabcd6d7a5f68f1f2a095a34b354adcd841bc9f3adbb164d107dd8ea650a3a98c SHA512 2b9235337c54b62b7e8df6f3d043666b1da14d5f257231947fe283585539d5701437a981f3dc37583a72117cccdb4a220d1bb7524aad49819227340f03e6de5b
+EBUILD superslicer-2.5.59.0-r3.ebuild 2244 BLAKE2B 0900a5070cbb47c86a352fcf925ca5ce5083643cec94f2e76ea0e1562d5729c2f7ef1b489f181e5f7a969bd0e402cf6952d97ad2849405c731ba3e3b6c2f5d39 SHA512 85d16abf564bff432a3c65342d5a2d0d7173d6118f4acdb6e66d0cedaff328dcaaa24aac0fc2d443c5607a6b045f380bad6583e2dc5a73536eef7e5115465dd0
 MISC metadata.xml 413 BLAKE2B a43550366844e53b0ebed37197d33bf38efb555eee344f053f90e35e939263e3959301fdd072d5b6925d1e3e0d1fd629e2f459356e2f227006f8784a4364fc11 SHA512 8e1abc223f2e24cca551b08cbc37910f2a43319fce7299e52dd586dd6454c83e98e59b8d14c18613c8894fdca33d04297affa2da1f4aa001a5e200e4b5f2c331
diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-AppConfig-include-I18N.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-AppConfig-include-I18N.patch
deleted file mode 100644
index c5e7398e5bdd..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.4.58.3-AppConfig-include-I18N.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
-index 59910e6..c35986c 100644
---- a/src/libslic3r/AppConfig.cpp
-+++ b/src/libslic3r/AppConfig.cpp
-@@ -1,6 +1,7 @@
- #include <boost/filesystem.hpp>
- #include "libslic3r/libslic3r.h"
- #include "libslic3r/Utils.hpp"
-+#include "libslic3r/I18N.hpp"
- #include "AppConfig.hpp"
- #include "Exception.hpp"
- #include "LocalesUtils.hpp"
diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-CreateMMUTiledCanvas-include-wx-rawbmp.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-CreateMMUTiledCanvas-include-wx-rawbmp.patch
deleted file mode 100644
index c2e3a3ef8f39..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.4.58.3-CreateMMUTiledCanvas-include-wx-rawbmp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-index be157ea..d63eb11 100644
---- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-+++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-@@ -40,6 +40,7 @@
- #include <wx/odcombo.h>
- #include <wx/textctrl.h>
- #include <wx/wrapsizer.h>
-+#include <wx/rawbmp.h>
- #include "wxExtensions.hpp"
- 
- #include <boost/filesystem/path.hpp>
diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch
deleted file mode 100644
index 0c1f31a95b72..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
-index 7c8029c..4791f06 100644
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -9,7 +9,7 @@
- 
- bool write_to_pot(boost::filesystem::path path, const std::vector<std::pair<std::string, std::string>>& data)
- {
--	boost::filesystem::ofstream file(std::move(path), std::ios_base::app);
-+	boost::nowide::ofstream file(path.string(), std::ios_base::app);
- 	for (const auto& element : data)
- 	{
- 		//Example of .pot element 
-diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
-index 39b590e..b2a8dce 100644
---- a/src/libslic3r/AppConfig.cpp
-+++ b/src/libslic3r/AppConfig.cpp
-@@ -1,3 +1,4 @@
-+#include <boost/filesystem.hpp>
- #include "libslic3r/libslic3r.h"
- #include "libslic3r/Utils.hpp"
- #include "AppConfig.hpp"
-diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp
-index d811ddc..1a70230 100644
---- a/src/libslic3r/AppConfig.hpp
-+++ b/src/libslic3r/AppConfig.hpp
-@@ -5,6 +5,7 @@
- #include <map>
- #include <string>
- 
-+#include <boost/filesystem/path.hpp>
- #include <boost/algorithm/string/trim_all.hpp>
- 
- #include "libslic3r/Config.hpp"
-diff --git a/src/libslic3r/LocalesUtils.cpp b/src/libslic3r/LocalesUtils.cpp
-index 5bf5205..7b87052 100644
---- a/src/libslic3r/LocalesUtils.cpp
-+++ b/src/libslic3r/LocalesUtils.cpp
-@@ -1,3 +1,4 @@
-+#include <boost/lexical_cast.hpp>
- #include "LocalesUtils.hpp"
- 
- #ifdef _WIN32
-diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
-index aa33fb6..277a4b4 100644
---- a/src/libslic3r/Preset.cpp
-+++ b/src/libslic3r/Preset.cpp
-@@ -84,7 +84,7 @@ ConfigFileType guess_config_file_type(const ptree &tree)
- VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all)
- {
-     ptree tree;
--    boost::filesystem::ifstream ifs(path);
-+    boost::nowide::ifstream ifs(path.string());
-     boost::property_tree::read_ini(ifs, tree);
-     return VendorProfile::from_ini(tree, path, load_all);
- }
-diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-index 89212f2..be157ea 100644
---- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-+++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
-@@ -18,6 +18,11 @@
- #include <wx/notebook.h>
- #include "Notebook.hpp"
- 
-+#include <boost/filesystem.hpp>
-+#include <boost/property_tree/ptree.hpp>
-+#include <boost/property_tree/ini_parser.hpp>
-+#include <boost/log/trivial.hpp>
-+
- #include "MainFrame.hpp"
- #include "wxExtensions.hpp"
- 
-diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-index fcb7472..866ebae 100644
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -14,6 +14,7 @@
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
- #include <boost/algorithm/string/replace.hpp>
-+#include <boost/nowide/fstream.hpp>
- 
- #include <wx/filename.h>
- #include <wx/stattext.h>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog()
- 
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
-diff --git a/src/slic3r/GUI/FreeCADDialog.cpp b/src/slic3r/GUI/FreeCADDialog.cpp
-index ea7142c..1d75ba7 100644
---- a/src/slic3r/GUI/FreeCADDialog.cpp
-+++ b/src/slic3r/GUI/FreeCADDialog.cpp
-@@ -38,6 +38,7 @@
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ptree.hpp>
- #include <boost/property_tree/json_parser.hpp>
-+#include <boost/nowide/fstream.hpp>
- 
- // hack for process.hpp : it uses pid_t to set it as alias of int, but vc_x64_lib (wx thingy) as a '#define pid_t int'
- // and so boost/process has a line 'typedef int int'instead of 'typedef int pid_t' that makes it crash
-@@ -321,7 +322,7 @@ bool FreeCADDialog::load_text_from_file(const boost::filesystem::path &path) {
-         try {
-             std::locale loc = boost::locale::generator()("en_US.UTF-8");
-             // Open the stream to 'lock' the file.
--            boost::filesystem::ifstream in;
-+            boost::nowide::ifstream in;
-             in.imbue(loc);
-             in.open(path);
-             // Obtain the size of the file.
-@@ -368,7 +369,7 @@ bool FreeCADDialog::write_text_in_file(const wxString &towrite, const boost::fil
-         boost::filesystem::create_directories(file.parent_path());
-         std::locale loc = boost::locale::generator()("en_US.UTF-8");
-         // Open the stream to 'lock' the file.
--        boost::filesystem::ofstream out;
-+        boost::nowide::ofstream out;
-         out.imbue(loc);
-         out.open(file);
-         out << towrite;
-diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
-index 7851030..4cdd242 100644
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -19,6 +19,7 @@
- #include <boost/lexical_cast.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/nowide/convert.hpp>
-+#include <boost/nowide/fstream.hpp>
- 
- #include <wx/stdpaths.h>
- #include <wx/imagpng.h>
-diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
-index 3291630..3a984bf 100644
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -14,12 +14,14 @@
- #include "libslic3r/Config.hpp"
- #include "libslic3r/PrintConfig.hpp"
- 
-+#include <map>
-+
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ini_parser.hpp>
--#include <map>
-+
- #include <cereal/archives/binary.hpp>
- #include <cereal/types/string.hpp>
- #include <cereal/types/vector.hpp>
-@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
- 
- void write_used_binary(const std::vector<std::string>& ids)
- {
--	boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
-+	boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
- 	cereal::BinaryOutputArchive archive(file);
- 		HintsCerealData cd { ids };
- 	try
-@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
- 		BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
- 		return;
- 	}
--	boost::filesystem::ifstream file(path);
-+	boost::nowide::ifstream file(path.string());
- 	cereal::BinaryInputArchive archive(file);
- 	HintsCerealData cd;
- 	try
-diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
-index 523e52c..bd07f02 100644
---- a/src/slic3r/GUI/Preferences.cpp
-+++ b/src/slic3r/GUI/Preferences.cpp
-@@ -12,6 +12,7 @@
- #include "OG_CustomCtrl.hpp"
- #include "wxExtensions.hpp"
- 
-+#include <boost/algorithm/string/split.hpp>
- #include <boost/filesystem.hpp>
- #include <boost/filesystem/path.hpp>
- 
-diff --git a/src/slic3r/GUI/ScriptExecutor.cpp b/src/slic3r/GUI/ScriptExecutor.cpp
-index 5a4a1e2..672bdfa 100644
---- a/src/slic3r/GUI/ScriptExecutor.cpp
-+++ b/src/slic3r/GUI/ScriptExecutor.cpp
-@@ -4,6 +4,13 @@
- #include "Tab.hpp"
- #include "libslic3r/PresetBundle.hpp"
- #include "libslic3r/Print.hpp"
-+#include <boost/log/trivial.hpp>
-+#include <boost/lexical_cast.hpp>
-+#include <boost/algorithm/string/trim_all.hpp>
-+#include <boost/algorithm/string/erase.hpp>
-+#include <boost/algorithm/string/split.hpp>
-+#include <boost/filesystem.hpp>
-+#include <boost/filesystem/string_file.hpp>
- 
- #include <string>
- 
-diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
-index 13a4ac0..eb63f2a 100644
---- a/src/slic3r/GUI/Tab.cpp
-+++ b/src/slic3r/GUI/Tab.cpp
-@@ -36,6 +36,8 @@
- #include <boost/filesystem.hpp>
- #include <boost/filesystem/path.hpp>
- #include <boost/lexical_cast.hpp>
-+#include <boost/nowide/fstream.hpp>
-+#include <boost/log/trivial.hpp>
- 
- #include "wxExtensions.hpp"
- #include "PresetComboBoxes.hpp"
-@@ -1692,7 +1694,7 @@ std::vector<Slic3r::GUI::PageShp> Tab::create_pages(std::string setting_type_nam
- 
-     //read file
-     //std::ifstream filestream(ui_layout_file.c_str());
--    boost::filesystem::ifstream filestream(ui_layout_file);
-+    boost::nowide::ifstream filestream(ui_layout_file);
-     std::string full_line;
-     while (std::getline(filestream, full_line)) {
-         //remove spaces
-diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp
-index 5fbe94e..b760559 100644
---- a/src/slic3r/Utils/Http.cpp
-+++ b/src/slic3r/Utils/Http.cpp
-@@ -11,6 +11,7 @@
- #include <boost/filesystem.hpp>
- #include <boost/format.hpp>
- #include <boost/log/trivial.hpp>
-+#include <boost/nowide/fstream.hpp>
- 
- #include <curl/curl.h>
- 
-@@ -52,7 +53,7 @@ namespace Slic3r {
- 						% error;
- 			})
- 			.on_complete([&](std::string body, unsigned /* http_status */) {
--				boost::filesystem::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
-+				boost::nowide::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
- 				file.write(body.c_str(), body.size());
- 				file.close();
- 				boost::filesystem::rename(tmp_path, target_path);
diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-cereal.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-cereal.patch
deleted file mode 100644
index 7b3e179a05f5..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.4.58.3-cereal.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/cmake/modules/Findcereal.cmake b/cmake/modules/Findcereal.cmake
-deleted file mode 100644
-index b482975..0000000
---- a/cmake/modules/Findcereal.cmake
-+++ /dev/null
-@@ -1,26 +0,0 @@
--set(_q "")
--if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
--    set(_q QUIET)
--    set(_quietly TRUE)
--endif()
--find_package(${CMAKE_FIND_PACKAGE_NAME} ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} CONFIG ${_q})
--
--if (NOT ${CMAKE_FIND_PACKAGE_NAME}_FOUND)
--    # Fall-back solution to find the Cereal serialization library header file
--    include(CheckIncludeFileCXX)
--    add_library(cereal INTERFACE)
--    target_include_directories(cereal INTERFACE include)
--
--    if (_quietly)
--        set(CMAKE_REQUIRED_QUIET ON)
--    endif()
--    CHECK_INCLUDE_FILE_CXX("cereal/cereal.hpp" HAVE_CEREAL_H)
--
--    if (NOT HAVE_CEREAL_H)
--        if (${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
--            message(FATAL_ERROR "Cereal library not found. Please install the dependency.")
--        elseif(NOT _quietly)
--            message(WARNING "Cereal library not found.")
--        endif()
--    endif ()
--endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ec44417..aab1348 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -141,7 +141,7 @@ if (NOT WIN32)
-     set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}")
- endif ()
- 
--target_link_libraries(Slic3r libslic3r cereal)
-+target_link_libraries(Slic3r libslic3r)
- if (APPLE)
- #    add_compile_options(-stdlib=libc++)
- #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
-diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
-index 21aab3b..8c6b705 100644
---- a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -358,7 +358,6 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS})
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-     libigl
-     miniz
-     boost_libs
-diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
-index 3f231ef..ffd9a3f 100644
---- a/src/slic3r/CMakeLists.txt
-+++ b/src/slic3r/CMakeLists.txt
-@@ -293,7 +293,7 @@ target_compile_definitions(libslic3r_gui PRIVATE $<$<BOOL:${SLIC3R_ALPHA}>:SLIC3
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-openexr3.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-openexr3.patch
deleted file mode 100644
index 7bd04e6fad10..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.4.58.3-openexr3.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake
-index 4fde5fa..566e73a 100644
---- a/cmake/modules/FindOpenVDB.cmake
-+++ b/cmake/modules/FindOpenVDB.cmake
-@@ -347,28 +347,10 @@ macro(just_fail msg)
-   return()
- endmacro()
- 
--find_package(IlmBase QUIET)
--if(NOT IlmBase_FOUND)
--  pkg_check_modules(IlmBase QUIET IlmBase)
--endif()
--if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
--  message(STATUS "Falling back to IlmBase found by pkg-config...")
--
--  find_library(IlmHalf_LIBRARY NAMES Half)
--  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
--    just_fail("IlmBase::Half can not be found!")
--  endif()
--  
--  add_library(IlmBase::Half UNKNOWN IMPORTED)
--  set_target_properties(IlmBase::Half PROPERTIES
--    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
--    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
--elseif(NOT IlmBase_FOUND)
--  just_fail("IlmBase::Half can not be found!")
--endif()
- find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
- find_package(ZLIB ${_quiet} ${_required})
- find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
-+find_package(Imath CONFIG)
- 
- # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
- # which we can query for optional deps. This basically runs ldd/otoll/objdump
-@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUISITE_LIST})
-     set(OpenVDB_USES_LOG4CPLUS ON)
-   endif()
- 
--  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
-+  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
-   if(NOT ${_HAS_DEP} EQUAL -1)
-     set(OpenVDB_USES_ILM ON)
-   endif()
-@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
-   find_package(Log4cplus ${_quiet} ${_required})
- endif()
- 
--if(OpenVDB_USES_ILM)
--  find_package(IlmBase ${_quiet} ${_required})
--endif()
--
--if(OpenVDB_USES_EXR)
-+if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
-   find_package(OpenEXR ${_quiet} ${_required})
- endif()
- 
-@@ -471,7 +449,7 @@ endif()
- set(_OPENVDB_VISIBLE_DEPENDENCIES
-   Boost::iostreams
-   Boost::system
--  IlmBase::Half
-+  Imath::Imath
- )
- 
- set(_OPENVDB_DEFINITIONS)
-@@ -481,10 +459,7 @@ endif()
- 
- if(OpenVDB_USES_EXR)
-   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
--    IlmBase::IlmThread
--    IlmBase::Iex
--    IlmBase::Imath
--    OpenEXR::IlmImf
-+    OpenEXR::OpenEXR
-   )
-   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
- endif()
diff --git a/media-gfx/superslicer/files/superslicer-2.4.58.3-wxgtk3-wayland.patch b/media-gfx/superslicer/files/superslicer-2.4.58.3-wxgtk3-wayland.patch
deleted file mode 100644
index 5f6eb58740ae..000000000000
--- a/media-gfx/superslicer/files/superslicer-2.4.58.3-wxgtk3-wayland.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp
-index 330869f..70c472c 100644
---- a/src/slic3r/GUI/GUI.cpp
-+++ b/src/slic3r/GUI/GUI.cpp
-@@ -33,6 +33,16 @@ class AppConfig;
- 
- namespace GUI {
- 
-+// wxgtk3 is broken on wayland: https://trac.wxwidgets.org/ticket/17702
-+#ifdef __WXGTK3__
-+struct ForceX11 {
-+    ForceX11() {
-+        setenv("GDK_BACKEND", "x11", 1);
-+    }
-+};
-+static struct ForceX11 forcex11;
-+#endif
-+
- #if __APPLE__
- IOPMAssertionID assertionID;
- #endif
diff --git a/media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild b/media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild
deleted file mode 100644
index c8ab9ba7f60f..000000000000
--- a/media-gfx/superslicer/superslicer-2.4.58.3-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-MY_PN="SuperSlicer"
-
-inherit cmake wxwidgets xdg
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="https://github.com/supermerill/SuperSlicer/"
-SRC_URI="
-	https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/slic3r/slic3r-profiles/archive/748fbdfd2ac077e4e415868e7bc963740b92aa8e.tar.gz -> ${P}-profiles.tar.gz
-"
-
-LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="test"
-
-# No dep on sci-libs/libigl, in-tree version cannot build
-# static library currently. Using bundled one.
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-cpp/tbb:=
-	dev-libs/boost:=[nls]
-	dev-libs/cereal
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/gmp:=
-	dev-libs/mpfr:=
-	dev-libs/imath:=
-	>=media-gfx/openvdb-8.2:=
-	net-misc/curl[adns]
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	media-libs/qhull:=
-	sci-libs/nlopt
-	>=sci-mathematics/cgal-5.0:=
-	sys-apps/dbus
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/opengl
-	x11-libs/gtk+:3
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-"
-DEPEND="${RDEPEND}
-	media-libs/qhull[static-libs]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-boost-1.79-port-v2.patch"
-	"${FILESDIR}/${P}-CreateMMUTiledCanvas-include-wx-rawbmp.patch"
-	"${FILESDIR}/${P}-AppConfig-include-I18N.patch"
-	"${FILESDIR}/${P}-cereal.patch"
-	"${FILESDIR}/${P}-openexr3.patch"
-	"${FILESDIR}/${P}-wxgtk3-wayland.patch"
-)
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
-	default
-
-	mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE="Release"
-
-	setup-wxwidgets
-
-	local mycmakeargs=(
-		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
-
-		-DSLIC3R_BUILD_TESTS=$(usex test)
-		-DSLIC3R_FHS=ON
-		-DSLIC3R_GTK=3
-		-DSLIC3R_GUI=ON
-		-DSLIC3R_PCH=OFF
-		-DSLIC3R_STATIC=OFF
-		-DSLIC3R_WX_STABLE=ON
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die
-}
diff --git a/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild b/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild
deleted file mode 100644
index ca0ff2b51c74..000000000000
--- a/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-MY_PN="SuperSlicer"
-
-inherit cmake wxwidgets xdg
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="https://github.com/supermerill/SuperSlicer/"
-SRC_URI="
-	https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/slic3r/slic3r-profiles/archive/748fbdfd2ac077e4e415868e7bc963740b92aa8e.tar.gz -> ${P}-profiles.tar.gz
-"
-
-LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="test"
-
-# No dep on sci-libs/libigl, in-tree version cannot build
-# static library currently. Using bundled one.
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-cpp/tbb:=
-	dev-libs/boost:=[nls]
-	dev-libs/cereal
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/gmp:=
-	dev-libs/mpfr:=
-	dev-libs/imath:=
-	>=media-gfx/openvdb-8.2:=
-	net-misc/curl[adns]
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	media-libs/qhull:=
-	sci-libs/nlopt
-	>=sci-mathematics/cgal-5.0:=
-	sys-apps/dbus
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/opengl
-	x11-libs/gtk+:3
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-"
-DEPEND="${RDEPEND}
-	media-libs/qhull[static-libs]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openexr3.patch"
-	"${FILESDIR}/${P}-wxgtk3-wayland.patch"
-	"${FILESDIR}/${P}-cereal.patch"
-	"${FILESDIR}/${P}-boost.patch"
-	"${FILESDIR}/${P}-missing-includes.patch"
-	"${FILESDIR}/${P}-dont-install-bundled-angelscript.patch"
-	"${FILESDIR}/${P}-fix-gcodeviewer-symlink.patch"
-)
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
-	default
-
-	mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE="Release"
-
-	setup-wxwidgets
-
-	local mycmakeargs=(
-		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
-
-		-DSLIC3R_BUILD_TESTS=$(usex test)
-		-DSLIC3R_FHS=ON
-		-DSLIC3R_GTK=3
-		-DSLIC3R_GUI=ON
-		-DSLIC3R_PCH=OFF
-		-DSLIC3R_STATIC=OFF
-		-DSLIC3R_WX_STABLE=ON
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die
-}
diff --git a/media-gfx/superslicer/superslicer-2.5.59.0-r2.ebuild b/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild
index 08c74ac46f52..5316cceb3c63 100644
--- a/media-gfx/superslicer/superslicer-2.5.59.0-r2.ebuild
+++ b/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 WX_GTK_VER="3.0-gtk3"
 MY_PN="SuperSlicer"
 
-inherit cmake wxwidgets xdg
+inherit cmake wxwidgets xdg flag-o-matic
 
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="https://github.com/supermerill/SuperSlicer/"
@@ -74,6 +74,8 @@ src_unpack() {
 src_configure() {
 	CMAKE_BUILD_TYPE="Release"
 
+	append-flags -fno-strict-aliasing
+
 	setup-wxwidgets
 
 	local mycmakeargs=(
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 94d62f763b3a..73e83a45d350 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index e1825b464069..f7c8b44aba53 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,8 +1,6 @@
 AUX vulkan-layers-1.3.231-Make-BUILD_WERROR-actually-work.patch 879 BLAKE2B c9468c7ebada19d1a252b6dc6f8dcc6edd2f5497e86cba815a4da900ad933f619ea8589071d86a387810b07d3cb58fcabcb4a86c15742e539f7333d55679abc3 SHA512 c8f86399a58cd2454c11e2e240def31b4dade136d1546da0b23c77d89de767dc9c126ac3e77a585cd56d82f5557a0316e439f1f724f4ab8e615d28520e66497a
 AUX vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch 5089 BLAKE2B e76b6fdedf175c246e227e1317243ceb1842b19ad7f64cc0d7ffa4935f554dbdf5664ee8907b47ac22e7308110ea0faced11aa40f3870f059a9679b4ef1db6f1 SHA512 28cad48b59458e21e8a46d3e7ea915a8d7358962e2c0a7f99db1db99ed9d6090a129be874cce7fc528991476ccc41acccc1f1627b449dfdb8555ce8173dbb179
-DIST vulkan-layers-1.3.224.tar.gz 4193501 BLAKE2B 84982d63339a2ef101cf9e1e9038e94415326a4a8a46b47d0a913bd0d35fa333dd35579f96536c6e147bf37ccdee0a8de12c1c13b74d3529f34645f8e10f0fa2 SHA512 c7d4f6df4bf0cbb970b36cff9197306769bf3f86ea98496b93e8c1779a905966f6b2303b04ba84099ce9c12e828633e2e0db22e49060393335312508b3540488
 DIST vulkan-layers-1.3.231.tar.gz 4408601 BLAKE2B 9b777559a540c34c5f86a93b15c42a223b8b7fd517f06e28d7bd0ba0fdc938063fd86126f7cdb43e692f3cc22296b5f8df924c2f39e3ead38325b2e1442bf3a6 SHA512 550ff2f5d718ab1a272977f3beb89f653107a7a2b89209408233cb3b969206d1d9383e0e8933343bc71fc920dd80e0cf62ad3baa588b671f24ce04cb93d4b606
-EBUILD vulkan-layers-1.3.224.ebuild 1495 BLAKE2B 36a564ae87d74cea6ccb1290799061ccf719377d489c74489fcfb92583956d3b0fc833212fc96d14384e08497ac887ff57be74d27ffadbcdb1202ce10d40bb23 SHA512 f5c8bb61e30baa93fe96fba65b60f6dec4116610ca1ccb85e53b8f31129a333d22d2ef6ccaef7581e6be62832923aba81b9230a2a1be64e258563a315e3f2999
 EBUILD vulkan-layers-1.3.231.ebuild 1658 BLAKE2B 290cb1394b931cdc45350f5173b1bf2cdd8311af02143e9a15101ddabb7da469b5dc0853596614c64f4236ba1e865e5a7b4314857be0a431b6e856a38dea4636 SHA512 0986e8a61ca261985ddcc584838b899c52bb1f1ce7fbf0a09e5534e209539b05bb136ee23d37fc4ac276fcc3868d980976063859d244d5b610c3e91b0075442d
 EBUILD vulkan-layers-9999.ebuild 1533 BLAKE2B 9e2705767f971e0e640e0d2ca94835d1ab35fa33125ef7994b262840dfc9c08d01a9009b5880f313246d951f9a69a56175e1b2852bcb2a7d3c4df16851ebf8a8 SHA512 548e1b678c893d772e3c18401da553081e7f7248d5d5f6b3ac72d5924817c3203b17dec7142d47ed2453c2648c6003471c71ccb0c8808050ee77509a42693d85
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.224.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.224.ebuild
deleted file mode 100644
index 2de51b8d228d..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.224.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-cpp/robin-hood-hashing-3.11.5
-	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index ce769c43e2d6..1c2fe70d8e68 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-loader-1.3.224.tar.gz 1594886 BLAKE2B a2b548c1b2ce4b5a700dca2708fc628ebc6ae248b5c1750cc2fe33d24e3f8260007f1fd04f2f3f55984889708354ebebf21bcce73e24f1da23aba426718f053a SHA512 e75f0d399703606fc89a08783c5cc9a542d7e14073039d63df4aac673d2b246a5c5b0ac4acab5e0f276b533c47645af11606de96460066fd70ccaa6de1888b37
 DIST vulkan-loader-1.3.231.tar.gz 1609720 BLAKE2B 0e6c2bdb6934502cd7f315636cf17dc0eeca7b990f8573944dcf5aec775272ce8c246efe51ee0395e0c2ed23c63a584be104d8a49a556c6d17e0fa66fda772cf SHA512 07f1a8e7737d9609a138b4e9740f9c2228db1ac56f8ddbf3c1ec0ec3b745647002ba3af4725347941dae2feb63e7c33c9db5f14ab98d2f47dfd2181a559ba849
-EBUILD vulkan-loader-1.3.224.ebuild 1722 BLAKE2B c63c31356baef1b2a547f183d4be776b8c8826426b7ada3d2b17dd9583936f102917fbb082b398c929bdc54b87e01749308996ddf8ec80ac9efd6785c2b15eea SHA512 27b112a05d865d20cdd766fb46395967ee22966bfb481194636c340a8657bebc77f696d4d5a826d9b212c4ae6a1612ecc4e357634b4b4174269ac402665af89f
 EBUILD vulkan-loader-1.3.231.ebuild 1722 BLAKE2B c63c31356baef1b2a547f183d4be776b8c8826426b7ada3d2b17dd9583936f102917fbb082b398c929bdc54b87e01749308996ddf8ec80ac9efd6785c2b15eea SHA512 27b112a05d865d20cdd766fb46395967ee22966bfb481194636c340a8657bebc77f696d4d5a826d9b212c4ae6a1612ecc4e357634b4b4174269ac402665af89f
 EBUILD vulkan-loader-9999.ebuild 1752 BLAKE2B b388bec1cfcb652262cd3da49722be05f8905a251949e8a69dca7dd29562bc77c1cd0dd95b1c100b7e30a6f242e88283bc1c159df284886fdd91052e4bfc059d SHA512 2a7b8d50a8317dd4ea7c454ccd5aefc3995f49a2e1c794161331c7fc8277d7dbe64b8ffcee3acc7b49675c9fe44994c91063527696aae137a52b59f3978d8ec3
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.224.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.224.ebuild
deleted file mode 100644
index e20950a2937c..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.3.224.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-inherit flag-o-matic cmake-multilib toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1a7416a0b91a..cb1baff079c0 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 73f4542b449f..05e6b81a0b77 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Dec 2022 13:09:42 +0000
+Wed, 28 Dec 2022 19:09:42 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index dde277e283c3..8f69ec45c3c4 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 538471 BLAKE2B b7385901234c82cabfe7b6fe500f9a2de535ba832c5fe98f7b1adcf90342ab9ac009a4eefb2c71141609f93233148e5db41c6f760cbea8413d0a285b67c25f90 SHA512 8b561e583b67bc367b59eefc1d958442632b1001434a1d0874a9ae00334c80cc4a27278dac1813b0d7b255f214d060c5e60573b828bb87fc8e319dc9233f12aa
-TIMESTAMP 2022-12-28T13:09:46Z
+MANIFEST Manifest.files.gz 538785 BLAKE2B a42e589b6c2be5ab4486b79822a326a12b3725dbc28e32cbb116cd453b6899511ab2026524f136171407f678f9acafd852f1a2a245b8caed5bad581d2eb86337 SHA512 8ff81ddfe9cd2569ab4fe6eabe9daf23f1f66918aba5cae55ff8241b2bb330fac90cb5595df81455bfa98b51ed1c6e965c73508fe1b662e752525e3e27b52956
+TIMESTAMP 2022-12-28T19:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOsQBpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOslHpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDAhQ//blbxpx9ata6gs23WCj6hoY/OSkQTOOUqhkdoxyKRpxKsez4P2kavVyVT
-pMeK7fIjwrUMtfuAPccsal7atyFuY/uwUytsZwZxH4N8yX8wggtn9yz9UJaz/oEm
-TaLI1z/LojO8hLmgzw3oWcCpGW1OtFJvyHE3Suru2XZU+7U00DGSsZGirfAZjqtm
-GXOCd/Ij3PsBecsHtNmiLExpqdsTDbjYxcNnVOWCulRApySVQsTKvYBOBbSnLq/k
-xfDjA3AGGgTsmMsBRjBoQL46qrD1C0//abMJtypx6obhBb0Bbby7VqhXw7Xcjp4e
-95VI/in54fr1my9Hw12IIvXiuTxStEmhnxckcioAsMTgsFLthYoO4ihgzTwH9idk
-m9R4VB7ZgbaQizxvG0lHlxE3Vr9uCXRK76NPQX4scQqqFA+rhoOAzOvlQo0Ozmj8
-Mii+8AWLz+zeBYr0MbVOr2M5BU1m/J5sU0IwBGpurYsMTrYjDOajKfont31v9Ur4
-jiQ65kkw05X5wAnwELodQqwcOIJ1cA+WTH090c0SFlmWwGXpISiAdQOeRAe0ZZmu
-4Xve8exVy3aKj72VyJQePWk+ybhQVEqIzBDUR/v/O3+ZA5FCFtAIvQ2IWgUXHCiE
-sc8tWdz0ueiPCzOy6xBxK0L9JYDKzKRN+GzUjI4TFxFoOLrT9Cg=
-=31+0
+klAGJA//bZn8RloRQKqa9d+/Me4A6vwvGZY6itOqxzZQ8Gou9NjhqL4E+FzQ6wdh
+uN0TnMWZfnijAqsS/3NUzNL9Hfk4iAOiOe3/WkWuLT/u2GsK2CsIxaLA59V10pfu
+CFMOms32PrVzRPis1W2904NPAXGFDNmCpu776ZRNhMqEyas6CD/PjkWLg9NkN1gr
+1CfKaBnqNEKFv1rRUjH4SDvxyzETJw37VnKsFTVUmpisrcQyfFC/BaSvjna47bds
+2kQST8lYEg2q0DYtQEXt/be/JzK+X8dRyBnap0ZEdZ5kjUszwe3HeHFy7FVr/Cvu
+hikbS77tVGhnbkfxIBQXvxFKHu6hzm3h/bCwDyl7Ycg5vpy+c74H1FSqU2/89PbP
+qi70LmrpvVIDHQM9OpQ7j6/jtB4JJfNS8GYWjBC7JFfFfCbm3g0g1FELsMb2vVuI
+lOuHM0dSJ3syxLX0HKkh+X375SpT9reeA2WZUwLTkiCBM/kYfY1KOpAO+k35l2n+
+mpf0reWddEH7cqfD+Xe7zpnK5ZMjxe/F2pLr4OL0w6piTF29kU0/bRo3TzVrfEMa
+1jYRFArP96fYWREOiLDlzEvmfOeu9q2rdKxnmnRxUi53AFJpDKprKbOfcTgG0PhI
+R1XWa5qESDodfD3QtteAemqTN4LgjFv6aZ/FSjSGRVeps+fa2RI=
+=woxM
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 08a5b8f59c90..5677e1e6d089 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-202212-06.xml b/metadata/glsa/glsa-202212-06.xml
new file mode 100644
index 000000000000..436b90c7c2c1
--- /dev/null
+++ b/metadata/glsa/glsa-202212-06.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202212-06">
+    <title>OpenSSH: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in OpenSSH, the worst of which could result in arbitrary code execution.</synopsis>
+    <product type="ebuild">openssh</product>
+    <announced>2022-12-28</announced>
+    <revised count="1">2022-12-28</revised>
+    <bug>874876</bug>
+    <bug>733802</bug>
+    <bug>815010</bug>
+    <access>remote</access>
+    <affected>
+        <package name="net-misc/openssh" auto="yes" arch="*">
+            <unaffected range="ge">9.1_p1</unaffected>
+            <vulnerable range="lt">9.1_p1</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>OpenSSH is a free application suite consisting of server and clients that replace tools like telnet, rlogin, rcp and ftp with more secure versions offering additional functionality.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in OpenSSH. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All OpenSSH users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=net-misc/openssh-9.1_p1"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-15778">CVE-2020-15778</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-12-28T18:57:54.132897Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-12-28T18:57:54.136452Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202212-07.xml b/metadata/glsa/glsa-202212-07.xml
new file mode 100644
index 000000000000..8842cbc2388f
--- /dev/null
+++ b/metadata/glsa/glsa-202212-07.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202212-07">
+    <title>libksba: Remote Code Execution</title>
+    <synopsis>An integer overflow vulnerability has been found in libksba which could result in remote code execution.</synopsis>
+    <product type="ebuild">libksba</product>
+    <announced>2022-12-28</announced>
+    <revised count="1">2022-12-28</revised>
+    <bug>877453</bug>
+    <access>remote</access>
+    <affected>
+        <package name="dev-libs/libksba" auto="yes" arch="*">
+            <unaffected range="ge">1.6.3</unaffected>
+            <vulnerable range="lt">1.6.3</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Libksba is a X.509 and CMS (PKCS#7) library.</p>
+    </background>
+    <description>
+        <p>An integer overflow in parsing ASN.1 objects could lead to a buffer overflow.</p>
+    </description>
+    <impact type="high">
+        <p>Crafted ASN.1 objects could trigger an integer overflow and buffer overflow to result in remote code execution.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All libksba users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=dev-libs/libksba-1.6.3"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-3515">CVE-2022-3515</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-47629">CVE-2022-47629</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-12-28T18:58:25.172111Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-12-28T18:58:25.175039Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 73f4542b449f..218dfa66fe48 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Dec 2022 13:09:42 +0000
+Wed, 28 Dec 2022 19:09:43 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 2b634000a4d7..861b82ee26e2 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-300d0a6989f134e6228f91cb9ea405db485ee8f0 1671415469 2022-12-19T02:04:29+00:00
+b95962b57e3a2b7645af0491db5baf8f15b6b69d 1672253964 2022-12-28T18:59:24+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 3b1efc4a9045..0c05a6ebeeb0 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 8bcfcc0ab9f7..25cfdf22ca50 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-2.2.0 b/metadata/md5-cache/app-backup/rdiff-backup-2.2.1
index 325b5c0b3093..6f98ef15c0e0 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-2.2.0
+++ b/metadata/md5-cache/app-backup/rdiff-backup-2.2.1
@@ -12,6 +12,6 @@ RDEPEND=dev-python/pylibacl[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/rdiff-backup/rdiff-backup/releases/download/v2.2.0/rdiff-backup-2.2.0.tar.gz https://dev.gentoo.org/~voyageur/distfiles/rdiff-backup-2.2.0-manpages.tar.gz
+SRC_URI=mirror://pypi/r/rdiff-backup/rdiff-backup-2.2.1.tar.gz https://github.com/rdiff-backup/rdiff-backup/releases/download/v2.2.1/rdiff-backup-old.1 https://github.com/rdiff-backup/rdiff-backup/releases/download/v2.2.1/rdiff-backup-delete.1 https://github.com/rdiff-backup/rdiff-backup/releases/download/v2.2.1/rdiff-backup-statistics.1 https://github.com/rdiff-backup/rdiff-backup/releases/download/v2.2.1/rdiff-backup.1
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=bfac5245860936010927a70d492b4899
+_md5_=2a2cb0c484b2550939754193c938a8e6
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 342aa15197fe..7e7fbd44dde4 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/company-math-1.4_p20210731 b/metadata/md5-cache/app-emacs/company-math-1.5.1
index 4779228cc732..2f8a0aed180b 100644
--- a/metadata/md5-cache/app-emacs/company-math-1.4_p20210731
+++ b/metadata/md5-cache/app-emacs/company-math-1.5.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/company-mode app-emacs/math-symbol-lists >=app-editors/emacs-23.1:*
 SLOT=0
-SRC_URI=https://github.com/vspinu/company-math/archive/45778f5731c97a21a83e3b965cbde42018709afd.tar.gz -> company-math-1.4_p20210731.tar.gz
+SRC_URI=https://github.com/vspinu/company-math/archive/v1.5.1.tar.gz -> company-math-1.5.1.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=dfa0c4f6e53371595507b7008373d3b8
+_md5_=84b40958b2ebfe18b71c31098d6c2bab
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index e9bafab48548..96a87f2b2e78 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/error-prone-annotations-2.16 b/metadata/md5-cache/dev-java/error-prone-annotations-2.16
new file mode 100644
index 000000000000..5912f6459f4f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/error-prone-annotations-2.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Java annotations for the Error Prone static analysis tool
+EAPI=8
+HOMEPAGE=https://errorprone.info
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/google/error-prone/archive/v2.16.tar.gz -> error-prone-2.16.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=8939caf50bcc6923e14faa7ec679236a
diff --git a/metadata/md5-cache/dev-java/guava-31.1 b/metadata/md5-cache/dev-java/guava-31.1
new file mode 100644
index 000000000000..e37560a68e32
--- /dev/null
+++ b/metadata/md5-cache/dev-java/guava-31.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/checker-framework-qual-3.14.0:0 >=dev-java/error-prone-annotations-2.16:0 >=dev-java/failureaccess-30.1.1:0 >=dev-java/j2objc-annotations-2.8:0 >=dev-java/jsr305-3.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A collection of Google's core Java libraries
+EAPI=8
+HOMEPAGE=https://github.com/google/guava
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/checker-framework-qual-3.14.0:0 >=dev-java/error-prone-annotations-2.16:0 >=dev-java/failureaccess-30.1.1:0 >=dev-java/j2objc-annotations-2.8:0 >=dev-java/jsr305-3.0.2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/google/guava/archive/v31.1.tar.gz -> guava-31.1.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=0b719fb181f766cdab68247680d54f7a
diff --git a/metadata/md5-cache/dev-java/guava-testlib-31.1 b/metadata/md5-cache/dev-java/guava-testlib-31.1
new file mode 100644
index 000000000000..b2e2989dabcf
--- /dev/null
+++ b/metadata/md5-cache/dev-java/guava-testlib-31.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/checker-framework-qual:0 dev-java/error-prone-annotations:0 ~dev-java/guava-31.1:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=A set of java classes to assist the tests for Guava itself
+EAPI=8
+HOMEPAGE=https://github.com/google/guava
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/checker-framework-qual:0 dev-java/error-prone-annotations:0 ~dev-java/guava-31.1:0 dev-java/j2objc-annotations:0 dev-java/jsr305:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/google/guava/archive/v31.1.tar.gz -> guava-31.1.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=671b79b800cd5ff9136f0d06d42797a8
diff --git a/metadata/md5-cache/dev-java/jctools-core-4.0.1 b/metadata/md5-cache/dev-java/jctools-core-4.0.1
new file mode 100644
index 000000000000..dd5d6737b442
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jctools-core-4.0.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava-testlib:0 dev-java/hamcrest-library:1.3 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Java Concurrency Tools Core Library
+EAPI=8
+HOMEPAGE=https://jctools.github.io/JCTools/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=https://github.com/JCTools/JCTools/archive/v4.0.1.tar.gz -> jctools-4.0.1.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=655a7d09fa40d4de36d49d7b7ed22a22
diff --git a/metadata/md5-cache/dev-java/woodstox-core-6.4.0 b/metadata/md5-cache/dev-java/woodstox-core-6.4.0
new file mode 100644
index 000000000000..df52562a3616
--- /dev/null
+++ b/metadata/md5-cache/dev-java/woodstox-core-6.4.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java/xsdlib:0 >=virtual/jdk-11:* dev-java/aqute-bnd-annotation:0 dev-java/osgi-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs
+EAPI=8
+HOMEPAGE=https://github.com/FasterXML/woodstox
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java/xsdlib:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FasterXML/woodstox/archive/woodstox-core-6.4.0.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=f3ea22af80e638a994fcf9e2bce74726
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
new file mode 100644
index 000000000000..e51dbf3b9e40
--- /dev/null
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-commons ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jdk-1.8:* test? ( dev-java/mockito:4 dev-java/xml-commons-resolver:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=XML Graphics Commons
+EAPI=8
+HOMEPAGE=https://xmlgraphics.apache.org/commons/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source test verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.8-src.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-2.8-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=adc0399e25dd7feaaf8ddaccd68c0b3d
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5 b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
new file mode 100644
index 000000000000..7e8336fbde10
--- /dev/null
+++ b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.5
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JNI bindings for Zstd native library
+EAPI=8
+HOMEPAGE=https://github.com/luben/zstd-jni
+INHERIT=java-pkg-2 java-pkg-simple cmake
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/luben/zstd-jni/archive/c1.5.2-5.tar.gz -> zstd-jni-1.5.2.5.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2539f01fa94bdd00ab9f502e4bd2fc18
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 72c0ab31ce94..742c3586e9c6 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/c-blosc-1.21.2 b/metadata/md5-cache/dev-libs/c-blosc-1.21.2
deleted file mode 100644
index 24251227a443..000000000000
--- a/metadata/md5-cache/dev-libs/c-blosc-1.21.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=Blocking, shuffling and lossless compression library
-EAPI=8
-HOMEPAGE=https://www.blosc.org/
-INHERIT=cmake
-IUSE=+lz4 +snappy test zlib zstd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.21.2.tar.gz -> c-blosc-1.21.2.gh.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dfcce8a36547a6b0ae5cb5f704b4c75e
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.21.3 b/metadata/md5-cache/dev-libs/c-blosc-1.21.3
index 632fb0d79c63..b32e0d9d7ebf 100644
--- a/metadata/md5-cache/dev-libs/c-blosc-1.21.3
+++ b/metadata/md5-cache/dev-libs/c-blosc-1.21.3
@@ -3,14 +3,14 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=Blocking, shuffling and lossless compression library
 EAPI=8
-HOMEPAGE=https://www.blosc.org/
+HOMEPAGE=https://www.blosc.org/ https://github.com/Blosc/c-blosc/
 INHERIT=cmake
 IUSE=+lz4 +snappy test zlib zstd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
 RDEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.21.3.tar.gz -> c-blosc-1.21.3.gh.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dfcce8a36547a6b0ae5cb5f704b4c75e
+_md5_=900d703aeac535ae6d17138112ad4ed9
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.21.1-r1 b/metadata/md5-cache/dev-libs/c-blosc2-2.6.1
index 62ebaf5a498a..ddeb8c390ee9 100644
--- a/metadata/md5-cache/dev-libs/c-blosc-1.21.1-r1
+++ b/metadata/md5-cache/dev-libs/c-blosc2-2.6.1
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
+DEPEND=>=app-arch/lz4-1.7.5:= zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=Blocking, shuffling and lossless compression library
 EAPI=8
-HOMEPAGE=https://www.blosc.org/
+HOMEPAGE=https://www.blosc.org/c-blosc2/c-blosc2.html https://github.com/Blosc/c-blosc2/
 INHERIT=cmake
-IUSE=+lz4 +snappy test zlib zstd
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
+IUSE=test zlib zstd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=app-arch/lz4-1.7.5:= zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=0/1
-SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.21.1.tar.gz -> c-blosc-1.21.1.tar.gz
+SRC_URI=https://github.com/Blosc/c-blosc2/archive/v2.6.1.tar.gz -> c-blosc2-2.6.1.gh.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=22c6849c4429e7451e1ede75bfd44bb6
+_md5_=b3a6072512e856a034079dd4e017b273
diff --git a/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0 b/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0
index 922f8d06dae1..a89789a4a916 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0
+++ b/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/DBIx-Simple
 INHERIT=perl-module
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=|| ( AFL-3.0 AGPL-3 APL-1.0 Apache-2.0 BSD-2 Boost-1.0 CDDL CPAL-1.0 EPL-1.0 ECL-2.0 EUPL-1.1 GPL-2 GPL-3 LGPL-2.1 LGPL-3 HPND IBM IPAfont ISC LPPL-1.3c 9base MIT MPL-2.0 NOSA nethack PHP-3 POSTGRESQL PYTHON CNRI QPL-1.0 OFL-1.1 Sleepycat Watcom-1.0 W3C wxWinLL-3 ZLIB libpng )
 RDEPEND=>=dev-perl/DBI-1.210.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.37.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=7d6ee895d70be20ce6abc2638d31653e
+_md5_=03243ca8cc3c963e0b1be0631e93caf8
diff --git a/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1 b/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1
index 9ad74815bb66..610e69074ef1 100644
--- a/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1
+++ b/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-DMARC
 INHERIT=perl-module
 IUSE=minimal test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Mail-DKIM dev-perl/Net-IMAP-Simple dev-perl/Net-SMTPS ) virtual/perl-Carp dev-perl/Config-Tiny >=dev-perl/DBD-SQLite-1.310.0 >=dev-perl/DBIx-Simple-1.350.0 virtual/perl-Data-Dumper dev-perl/Email-MIME >=dev-perl/Email-Sender-1.300.32 dev-perl/Email-Simple virtual/perl-Encode dev-perl/File-ShareDir virtual/perl-Getopt-Long virtual/perl-HTTP-Tiny virtual/perl-IO virtual/perl-IO-Compress dev-perl/IO-Socket-SSL dev-perl/libwww-perl dev-perl/Mail-DKIM dev-perl/Net-DNS dev-perl/Net-HTTP dev-perl/Net-IDN-Encode dev-perl/Net-IP dev-perl/Net-SMTPS dev-perl/Net-SSLeay >=dev-perl/Net-Server-2 virtual/perl-Socket >=dev-perl/Socket6-0.230.0 virtual/perl-Sys-Syslog dev-perl/Test-File-ShareDir dev-perl/URI dev-perl/XML-LibXML virtual/perl-parent >=dev-perl/Regexp-Common-2013031301 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DMARC-1.20210927.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=3e3ca2f22566cd628636687a1ea96659
+_md5_=e7086411e44d2cb3741c4eae29139f72
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 48127301b402..d77d84eb8b79 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200 b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200
index d1228faaf638..24176d2e4c78 100644
--- a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200
+++ b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-IMAP-Simple
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO dev-perl/Parse-RecDescent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JETTERO/Net-IMAP-Simple-1.2212.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=63a9265a5b77c4e8f8152fae94d15a68
+_md5_=fc4a5e4a36a1fc3e0237e717442f64ec
diff --git a/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0 b/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0
index fdc7e4f2c3e3..107ab2573133 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0
+++ b/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-SMTPS
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Authen-SASL-2.0.0 >=dev-perl/IO-Socket-SSL-1.0.0 >=virtual/perl-libnet-2.0.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOMO/src/Net-SMTPS-0.10.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=63357fbf6ceb9f98247c75870a593d36
+_md5_=bc5c8d97771d32c97daa3fe0656dcbe9
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 1b53aaced030..eab1157b6be4 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/blosc-1.10.6 b/metadata/md5-cache/dev-python/blosc-1.10.6
index 35cbc9840cbc..1fdc1c041eeb 100644
--- a/metadata/md5-cache/dev-python/blosc-1.10.6
+++ b/metadata/md5-cache/dev-python/blosc-1.10.6
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.blosc.org/ https://github.com/Blosc/python-blosc/ https://p
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
+LICENSE=BSD
 RDEPEND=>=dev-libs/c-blosc-1.19.0:= python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Blosc/python-blosc/archive/v1.10.6.tar.gz -> python-blosc-1.10.6.gh.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=34fd8b501d75c6a8485cf68421b31901
+_md5_=6bc861c58c68ca642f81f5e52cd80828
diff --git a/metadata/md5-cache/dev-python/blosc-1.11.0 b/metadata/md5-cache/dev-python/blosc-1.11.0
index 8404859ac123..43ebdd2d7c93 100644
--- a/metadata/md5-cache/dev-python/blosc-1.11.0
+++ b/metadata/md5-cache/dev-python/blosc-1.11.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.blosc.org/ https://github.com/Blosc/python-blosc/ https://p
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
+LICENSE=BSD
 RDEPEND=>=dev-libs/c-blosc-1.19.0:= python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Blosc/python-blosc/archive/v1.11.0.tar.gz -> python-blosc-1.11.0.gh.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=94c68c2fc368c2a5695af69fc7fbcac1
+_md5_=8453615662034f6e0c3aa1fe6c1cba40
diff --git a/metadata/md5-cache/dev-python/blosc-1.11.1 b/metadata/md5-cache/dev-python/blosc-1.11.1
index 4e0a199d82ee..2c1dade558cc 100644
--- a/metadata/md5-cache/dev-python/blosc-1.11.1
+++ b/metadata/md5-cache/dev-python/blosc-1.11.1
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.blosc.org/ https://github.com/Blosc/python-blosc/ https://p
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
+LICENSE=BSD
 RDEPEND=>=dev-libs/c-blosc-1.19.0:= python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Blosc/python-blosc/archive/v1.11.1.tar.gz -> python-blosc-1.11.1.gh.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=94c68c2fc368c2a5695af69fc7fbcac1
+_md5_=8453615662034f6e0c3aa1fe6c1cba40
diff --git a/metadata/md5-cache/dev-python/pytables-3.8.0 b/metadata/md5-cache/dev-python/pytables-3.8.0
new file mode 100644
index 000000000000..d73255aff0be
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytables-3.8.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/cython-0.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/py-cpuinfo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig test? ( app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0:= >=dev-libs/c-blosc-1.11.1:0= dev-libs/c-blosc2:= dev-libs/lzo:2= >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sci-libs/hdf5-1.8.4:= >=dev-python/numexpr-2.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/py-cpuinfo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0:= >=dev-libs/c-blosc-1.11.1:0= dev-libs/c-blosc2:= dev-libs/lzo:2= >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sci-libs/hdf5-1.8.4:=
+DESCRIPTION=Hierarchical datasets for Python
+EAPI=8
+HOMEPAGE=https://www.pytables.org/ https://github.com/PyTables/PyTables/ https://pypi.org/project/tables/
+INHERIT=distutils-r1
+IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0:= >=dev-libs/c-blosc-1.11.1:0= dev-libs/c-blosc2:= dev-libs/lzo:2= >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sci-libs/hdf5-1.8.4:= >=dev-python/numexpr-2.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/py-cpuinfo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tables/tables-3.8.0.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=11ee41e01b0fcc403bf89d8c4e5ae293
diff --git a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330 b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330
deleted file mode 100644
index 9fd6558f875a..000000000000
--- a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/PyPDF2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[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 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/PyPDF2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=Suite of tools for PDF files manipulation written in Python
-EAPI=8
-HOMEPAGE=https://github.com/hellerbarde/stapler
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/PyPDF2[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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hellerbarde/stapler/archive/382f1edc62296e071093a5419811a2fca9d78d93.tar.gz -> stapler-1.0.0_p20220330.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f4cb5399a9b69c092d7b9bcee28d61a3
diff --git a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r1 b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r1
new file mode 100644
index 000000000000..9027ed3ea027
--- /dev/null
+++ b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( <dev-python/PyPDF2-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[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 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( <dev-python/PyPDF2-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=Suite of tools for PDF files manipulation written in Python
+EAPI=8
+HOMEPAGE=https://github.com/hellerbarde/stapler
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-python/PyPDF2-3[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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hellerbarde/stapler/archive/382f1edc62296e071093a5419811a2fca9d78d93.tar.gz -> stapler-1.0.0_p20220330.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=c030f3dd56cc066d935f88e2a5ae6ea8
diff --git a/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r2 b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r2
new file mode 100644
index 000000000000..9b810b1fc1d4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/stapler-1.0.0_p20220330-r2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-python/PyPDF2-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[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 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/PyPDF2-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=Suite of tools for PDF files manipulation written in Python
+EAPI=8
+HOMEPAGE=https://github.com/hellerbarde/stapler
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/PyPDF2-3.0.0[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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hellerbarde/stapler/archive/382f1edc62296e071093a5419811a2fca9d78d93.tar.gz -> stapler-1.0.0_p20220330.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=85416331babd62d12e3dd723a3648b25
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 925491a0094d..aaecaad2014b 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/coccinelle-1.1.1-r3 b/metadata/md5-cache/dev-util/coccinelle-1.1.1-r4
index 07e70e067535..9c2ca0f8b6a0 100644
--- a/metadata/md5-cache/dev-util/coccinelle-1.1.1-r3
+++ b/metadata/md5-cache/dev-util/coccinelle-1.1.1-r4
@@ -14,4 +14,4 @@ RESTRICT=strip !test? ( test ) test
 SLOT=0
 SRC_URI=https://gitlab.inria.fr/coccinelle/coccinelle/-/archive/1.1.1/coccinelle-1.1.1.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=03d10a49c8c3a0809cf4cb1883627c44
+_md5_=58475805122090d95e95de649739aecd
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.3.224 b/metadata/md5-cache/dev-util/spirv-headers-1.3.224
deleted file mode 100644
index ff6650c7aac4..000000000000
--- a/metadata/md5-cache/dev-util/spirv-headers-1.3.224
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Machine-readable files for the SPIR-V Registry
-EAPI=7
-HOMEPAGE=https://www.khronos.org/registry/spir-v/
-INHERIT=cmake
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-1.3.224.tar.gz -> spirv-headers-1.3.224.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c34754962316c2e81dc5ce6449721778
diff --git a/metadata/md5-cache/dev-util/spirv-tools-1.3.224 b/metadata/md5-cache/dev-util/spirv-tools-1.3.224
deleted file mode 100644
index be96abb16eda..000000000000
--- a/metadata/md5-cache/dev-util/spirv-tools-1.3.224
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9:3.10[xml(+)] >=dev-lang/python-3.9.16:3.9[xml(+)] >=dev-lang/python-3.8.16:3.8[xml(+)] ) ~dev-util/spirv-headers-1.3.224 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~dev-util/spirv-headers-1.3.224
-DESCRIPTION=Provides an API and commands for processing SPIR-V modules
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
-INHERIT=cmake-multilib python-any-r1
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-1.3.224.0.tar.gz -> spirv-tools-1.3.224.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7f13669231115932231b0093a54d3803
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.3.224 b/metadata/md5-cache/dev-util/vulkan-headers-1.3.224
deleted file mode 100644
index de65c74e2c45..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.3.224
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Vulkan Header files and API registry
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
-INHERIT=cmake
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.3.224.0.tar.gz -> vulkan-headers-1.3.224.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fffd8212fe675d8e6408a01948c6a644
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.3.224 b/metadata/md5-cache/dev-util/vulkan-tools-1.3.224
deleted file mode 100644
index 3ad64055d632..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-tools-1.3.224
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) >=dev-util/cmake-3.10.2 cube? ( ~dev-util/glslang-1.3.224:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~media-libs/vulkan-loader-1.3.224:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ~dev-util/vulkan-headers-1.3.224
-DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
-INHERIT=cmake-multilib python-any-r1
-IUSE=cube wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv
-LICENSE=Apache-2.0
-RDEPEND=~media-libs/vulkan-loader-1.3.224:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=cube? ( ^^ ( X wayland ) )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.3.224.0.tar.gz -> vulkan-tools-1.3.224.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b5b6032cde265a658455e1f0d7d02126
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index efe5521ae270..4a18fd61c741 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/spamassassin-4.0.0 b/metadata/md5-cache/mail-filter/spamassassin-4.0.0
index d3d8ee088e5f..770bf0e4eecd 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-4.0.0
+++ b/metadata/md5-cache/mail-filter/spamassassin-4.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://spamassassin.apache.org/
 INHERIT=perl-functions systemd toolchain-funcs verify-sig
 IUSE=berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test verify-sig
-KEYWORDS=~alpha ~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Digest-SHA ssl? ( dev-libs/openssl:0= ) app-crypt/gnupg dev-perl/Archive-Zip dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Email-Address-XS dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/IO-String dev-perl/Mail-DKIM dev-perl/Mail-DMARC dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-LibIDN2 dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 dev-perl/Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-4.0.0.tar.bz2 verify-sig? ( https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-4.0.0.tar.bz2.asc )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=883842bfec54704c6dbb0ce6c2128d2f
+_md5_=111e0758fd3690c5b9ec89f607bd3aef
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 1c0a1069447d..0b68fcb64d4e 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/prusaslicer-2.5.0 b/metadata/md5-cache/media-gfx/prusaslicer-2.5.0
index 2240b8d5e70c..5b16a03cf333 100644
--- a/metadata/md5-cache/media-gfx/prusaslicer-2.5.0
+++ b/metadata/md5-cache/media-gfx/prusaslicer-2.5.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.prusa3d.com/prusaslicer/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake wxwidgets xdg
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT
 RDEPEND=dev-cpp/eigen:3 dev-cpp/tbb:= dev-libs/boost:=[nls] dev-libs/cereal dev-libs/expat dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/qhull:= sci-libs/libigl sci-libs/nlopt =sci-libs/opencascade-7.6*:= >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X,opengl]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_2.5.0.tar.gz -> prusaslicer-2.5.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f596db01acbd0841cb8c3f8bdcbca368
+_md5_=b8dd3b0382f1c7af20eb5cb196d6cb21
diff --git a/metadata/md5-cache/media-gfx/superslicer-2.4.58.3-r1 b/metadata/md5-cache/media-gfx/superslicer-2.4.58.3-r1
deleted file mode 100644
index 998ef6f10ad4..000000000000
--- a/metadata/md5-cache/media-gfx/superslicer-2.4.58.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-cpp/eigen:3 dev-cpp/tbb:= dev-libs/boost:=[nls] dev-libs/cereal dev-libs/expat dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/nlopt >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= virtual/glu virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X,opengl] media-libs/qhull[static-libs]
-DESCRIPTION=A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)
-EAPI=8
-HOMEPAGE=https://github.com/supermerill/SuperSlicer/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake wxwidgets xdg
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT
-RDEPEND=dev-cpp/eigen:3 dev-cpp/tbb:= dev-libs/boost:=[nls] dev-libs/cereal dev-libs/expat dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/nlopt >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= virtual/glu virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X,opengl]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/supermerill/SuperSlicer/archive/refs/tags/2.4.58.3.tar.gz -> superslicer-2.4.58.3.tar.gz https://github.com/slic3r/slic3r-profiles/archive/748fbdfd2ac077e4e415868e7bc963740b92aa8e.tar.gz -> superslicer-2.4.58.3-profiles.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3370d2c3dc4356e21f5eebb1e63849fb
diff --git a/metadata/md5-cache/media-gfx/superslicer-2.5.59.0-r2 b/metadata/md5-cache/media-gfx/superslicer-2.5.59.0-r2
deleted file mode 100644
index 841daf67034e..000000000000
--- a/metadata/md5-cache/media-gfx/superslicer-2.5.59.0-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-cpp/eigen:3 dev-cpp/tbb:= dev-libs/boost:=[nls] dev-libs/cereal dev-libs/expat dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/nlopt >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= virtual/glu virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X,opengl] media-libs/qhull[static-libs]
-DESCRIPTION=A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)
-EAPI=8
-HOMEPAGE=https://github.com/supermerill/SuperSlicer/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake wxwidgets xdg
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT
-RDEPEND=dev-cpp/eigen:3 dev-cpp/tbb:= dev-libs/boost:=[nls] dev-libs/cereal dev-libs/expat dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/nlopt >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= virtual/glu virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X,opengl]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/supermerill/SuperSlicer/archive/refs/tags/2.5.59.0.tar.gz -> superslicer-2.5.59.0.tar.gz https://github.com/slic3r/slic3r-profiles/archive/748fbdfd2ac077e4e415868e7bc963740b92aa8e.tar.gz -> superslicer-2.5.59.0-profiles.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a336b62b6693708972cf9e44a571bb80
diff --git a/metadata/md5-cache/media-gfx/superslicer-2.5.59.0-r1 b/metadata/md5-cache/media-gfx/superslicer-2.5.59.0-r3
index a3c678618d4a..58e11a470cc8 100644
--- a/metadata/md5-cache/media-gfx/superslicer-2.5.59.0-r1
+++ b/metadata/md5-cache/media-gfx/superslicer-2.5.59.0-r3
@@ -5,7 +5,7 @@ DESCRIPTION=A mesh slicer to generate G-code for fused-filament-fabrication (3D
 EAPI=8
 HOMEPAGE=https://github.com/supermerill/SuperSlicer/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake wxwidgets xdg
+INHERIT=cmake wxwidgets xdg flag-o-matic
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/supermerill/SuperSlicer/archive/refs/tags/2.5.59.0.tar.gz -> superslicer-2.5.59.0.tar.gz https://github.com/slic3r/slic3r-profiles/archive/748fbdfd2ac077e4e415868e7bc963740b92aa8e.tar.gz -> superslicer-2.5.59.0-profiles.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3095ddfcebeba29bddc3b561f60cedef
+_md5_=a3c51297745ba5fce855656fb08540ce
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 5eb501d45c91..80d72b7466d1 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.3.224 b/metadata/md5-cache/media-libs/vulkan-layers-1.3.224
deleted file mode 100644
index 2ba433e24bc3..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.3.224
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~dev-util/spirv-tools-1.3.224:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) >=dev-cpp/robin-hood-hashing-3.11.5 ~dev-util/glslang-1.3.224:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-util/vulkan-headers-1.3.224 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Vulkan Validation Layers
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
-INHERIT=cmake-multilib python-any-r1
-IUSE=wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-util/spirv-tools-1.3.224:=[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=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.3.224.0.tar.gz -> vulkan-layers-1.3.224.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8d3c50655444975ebafa9d6304a922c3
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.3.224 b/metadata/md5-cache/media-libs/vulkan-loader-1.3.224
deleted file mode 100644
index c41a6ca2d6ef..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.3.224
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=~dev-util/vulkan-headers-1.3.224 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
-INHERIT=flag-o-matic cmake-multilib toolchain-funcs
-IUSE=layers wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-PDEPEND=layers? ( media-libs/vulkan-layers:=[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=https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.3.224.tar.gz -> vulkan-loader-1.3.224.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=13d994d906c93633c9606182f259a82a
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 466c96eb0f22..5921ca188dd2 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/nsd-4.5.0 b/metadata/md5-cache/net-dns/nsd-4.5.0
deleted file mode 100644
index a2cda3f9787c..000000000000
--- a/metadata/md5-cache/net-dns/nsd-4.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex app-alternatives/yacc systemd? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
-DESCRIPTION=An authoritative only, high performance, open source name server
-EAPI=8
-HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
-INHERIT=autotools systemd
-IUSE=bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.5.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=3f885c6b11a4c154ebc1b1c651ad92e4
diff --git a/metadata/md5-cache/net-dns/unbound-1.17.0 b/metadata/md5-cache/net-dns/unbound-1.17.0
new file mode 100644
index 000000000000..81e00f52882f
--- /dev/null
+++ b/metadata/md5-cache/net-dns/unbound-1.17.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig python? ( dev-lang/swig ) test? ( || ( net-libs/ldns[examples(-)] net-dns/ldns-utils[examples(-)] ) dev-util/splint app-text/wdiff ) verify-sig? ( sec-keys/openpgp-keys-unbound ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/openssl-1.0.1h-r2: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(-)?] dnscrypt? ( dev-libs/libsodium:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-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(-)?] ) ecdsa? ( dev-libs/openssl:0[-bindist(-)] ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) redis? ( dev-libs/hiredis:= ) systemd? ( sys-apps/systemd )
+DESCRIPTION=A validating, recursive and caching DNS resolver
+EAPI=8
+HOMEPAGE=https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/
+INHERIT=autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig
+IUSE=debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD GPL-2
+RDEPEND=acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/openssl-1.0.1h-r2: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(-)?] dnscrypt? ( dev-libs/libsodium:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-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(-)?] ) ecdsa? ( dev-libs/openssl:0[-bindist(-)] ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) redis? ( dev-libs/hiredis:= ) systemd? ( sys-apps/systemd ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0/8
+SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.17.0.tar.gz verify-sig? ( https://nlnetlabs.nl/downloads/unbound/unbound-1.17.0.tar.gz.asc )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=271548e9369a3a6e1e96de566de232ee
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 695b7022ea7b..fddff8595f05 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-xmlgraphics-commons-20150603 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-xmlgraphics-commons-20150603
new file mode 100644
index 000000000000..795018cf991d
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-xmlgraphics-commons-20150603
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by xmlgraphics.apache.org/commons
+EAPI=8
+HOMEPAGE=https://xmlgraphics.apache.org/commons/download.html
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://downloads.apache.org/xmlgraphics/commons/KEYS -> openpgp-keys-apache-xmlgraphics-commons-20150603-KEYS.asc
+_md5_=5ec7da340b831d09150f45c917d1a1d9
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 669e182d3e3b..5d8b771d6820 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-config-5.4 b/metadata/md5-cache/sys-devel/binutils-config-5.4
deleted file mode 100644
index 5f5823927787..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-config-5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Utility to change the binutils version being used
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Toolchain
-INHERIT=prefix
-IUSE=+native-symlinks
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/binutils-config-5.4.tar.xz
-_eclasses_=prefix	eab3c99d77fe00506c109c8a736186f7
-_md5_=0ea389e4b4b4128ae5d01edc33fa4926
diff --git a/metadata/md5-cache/sys-devel/crossdev-20220709 b/metadata/md5-cache/sys-devel/crossdev-20220709
deleted file mode 100644
index 3a14847c8d0b..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20220709
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=install
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/crossdev/crossdev-20220709.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20220709.tar.xz
-_md5_=9e25d76e549cdcf4539150971378cb00
diff --git a/metadata/md5-cache/sys-devel/crossdev-20220818 b/metadata/md5-cache/sys-devel/crossdev-20220818
deleted file mode 100644
index eb52a88a144a..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20220818
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=install
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/crossdev/crossdev-20220818.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20220818.tar.xz
-_md5_=8d8b13bfa7209da6c6a1d792cdfbe55c
diff --git a/metadata/md5-cache/sys-devel/crossdev-20221227 b/metadata/md5-cache/sys-devel/crossdev-20221227-r1
index 699cc3a59040..63e4ecca910d 100644
--- a/metadata/md5-cache/sys-devel/crossdev-20221227
+++ b/metadata/md5-cache/sys-devel/crossdev-20221227-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
+RDEPEND=>=sys-apps/portage-2.1 app-shells/bash sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/crossdev/crossdev-20221227.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20221227.tar.xz
-_md5_=db48da59eef8cdc24786d8fa53a3e1da
+_md5_=1f3826bf8ed18477fb39c1fbacb50e99
diff --git a/metadata/md5-cache/sys-devel/crossdev-99999999 b/metadata/md5-cache/sys-devel/crossdev-99999999
index c7f9ad1dc452..8e3cbf88e54c 100644
--- a/metadata/md5-cache/sys-devel/crossdev-99999999
+++ b/metadata/md5-cache/sys-devel/crossdev-99999999
@@ -6,7 +6,7 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
 INHERIT=git-r3
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
+RDEPEND=>=sys-apps/portage-2.1 app-shells/bash sys-apps/gentoo-functions
 SLOT=0
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f
-_md5_=db48da59eef8cdc24786d8fa53a3e1da
+_md5_=1f3826bf8ed18477fb39c1fbacb50e99
diff --git a/metadata/md5-cache/sys-devel/gcc-config-2.4 b/metadata/md5-cache/sys-devel/gcc-config-2.4
deleted file mode 100644
index c5fca5d87347..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-config-2.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Utility to manage compilers
-EAPI=7
-HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
-IUSE=+cc-wrappers +native-symlinks
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/gentoo-functions-0.10
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/gcc-config-2.4.tar.xz
-_md5_=3bc54af83aa613e3f699af94c1b604c9
diff --git a/metadata/md5-cache/sys-devel/gcc-config-2.5-r1 b/metadata/md5-cache/sys-devel/gcc-config-2.5-r1
deleted file mode 100644
index 333217defe91..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-config-2.5-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Utility to manage compilers
-EAPI=7
-HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
-IUSE=+cc-wrappers +native-symlinks
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/gentoo-functions-0.10
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc-config/gcc-config-2.5.tar.xz
-_md5_=391981481fdda47307d32755bcbce47a
diff --git a/metadata/md5-cache/sys-devel/gcc-config-2.6 b/metadata/md5-cache/sys-devel/gcc-config-2.6
deleted file mode 100644
index 24289c6741b4..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-config-2.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Utility to manage compilers
-EAPI=8
-HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
-IUSE=+cc-wrappers +native-symlinks
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/gentoo-functions-0.10
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc-config/gcc-config-2.6.tar.xz
-_md5_=39451caeec5fbe4eb55be3ea11cf6b4d
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index e5250c4e4498..bb6c2187f922 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.6 b/metadata/md5-cache/x11-base/xorg-server-21.1.6
index 94d32380b86f..a5a80de6fd40 100644
--- a/metadata/md5-cache/x11-base/xorg-server-21.1.6
+++ b/metadata/md5-cache/x11-base/xorg-server-21.1.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
 INHERIT=flag-o-matic xorg-3 meson
 IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 )
 RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/21.1.6
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.6.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=f79e6390285a037e50abe783fa78c46a
+_md5_=d810d563394bf444d6359c7dff340148
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.7 b/metadata/md5-cache/x11-base/xwayland-22.1.7
index a0794b09edd6..4e4022f7a156 100644
--- a/metadata/md5-cache/x11-base/xwayland-22.1.7
+++ b/metadata/md5-cache/x11-base/xwayland-22.1.7
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wayland.freedesktop.org/xserver.html
 INHERIT=meson
 IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.7.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=eef35da6e842e56a006c53a8511bc9ff
+_md5_=fc7ea351ee8bdebc781d540e919f18da
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 5b64ae455ba8..71d3f223de12 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/elementary-xfce-icon-theme-0.17 b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.17
new file mode 100644
index 000000000000..054dda3625ef
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.17
@@ -0,0 +1,13 @@
+BDEPEND=media-gfx/optipng x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DESCRIPTION=Elementary icons forked from upstream, extended and maintained for Xfce
+EAPI=8
+HOMEPAGE=https://github.com/shimmerproject/elementary-xfce
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=xdg toolchain-funcs
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=public-domain GPL-1 GPL-2 GPL-3
+SLOT=0
+SRC_URI=https://github.com/shimmerproject/elementary-xfce/archive/v0.17.tar.gz -> elementary-xfce-0.17.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e666ac9d634acc312c963b6701451424
diff --git a/metadata/news/2022-12-27-alternatives-introduction/2022-12-27-alternatives-introduction.en.txt b/metadata/news/2022-12-27-alternatives-introduction/2022-12-27-alternatives-introduction.en.txt
index 601142ffde19..0fb878541a5e 100644
--- a/metadata/news/2022-12-27-alternatives-introduction/2022-12-27-alternatives-introduction.en.txt
+++ b/metadata/news/2022-12-27-alternatives-introduction/2022-12-27-alternatives-introduction.en.txt
@@ -32,7 +32,7 @@ The initial list of packages which support alternatives is as follows:
 The stabilization of these new ebuilds and packages depending
 on them is ongoing in bug 886017 [1].
 
-## Per-upgrade requirements
+## Pre-upgrade requirements
 
 The default configuration on Gentoo systems is FEATURES="protect-owned"
 which works similarly to FEATURES="collision-protect" but it allows
@@ -60,8 +60,9 @@ orphaned files where no package owns the file.
 To migrate your system, a standard world upgrade will suffice after
 deselecting eselect-awk and eselect-sh:
 1. # emerge --deselect app-eselect/eselect-awk app-eselect/eselect-sh
-2. # emerge --sync
-3. # emerge -a -uvDU @world (or other similar standard world upgrade command)
+2. # emerge --depclean app-eselect/eselect-awk app-eselect/eselect-sh
+3. # emerge --sync
+4. # emerge -a -uvDU @world (or other similar standard world upgrade command)
 
 ## Configuration
 
@@ -77,11 +78,11 @@ Going forward, /etc/portage/package.use will be used for this purpose.
 Users should review the USE flags available for the various app-alternatives
 ebuilds like app-alternatives/sh and adjust their configuration as desired.
 
-For example, to have /usr/bin/gzip be provided by app-arch/pigz for automatic
+For example, to have /bin/gzip be provided by app-arch/pigz for automatic
 parallelization of 'gzip', one would have the following in /etc/portage/package.use:
 ```
 # https://wiki.gentoo.org/wiki/Gzip#Parallelization
-# Make /usr/bin/gzip be a symlink to pigz for a speedup in compression
+# Make /bin/gzip be a symlink to pigz for a speedup in compression
 app-alternatives/gzip -reference pigz
 ```
 
diff --git a/metadata/news/2022-12-27-alternatives-introduction/2022-12-27-alternatives-introduction.ru.txt b/metadata/news/2022-12-27-alternatives-introduction/2022-12-27-alternatives-introduction.ru.txt
index 254bb4095008..25a989f712b3 100644
--- a/metadata/news/2022-12-27-alternatives-introduction/2022-12-27-alternatives-introduction.ru.txt
+++ b/metadata/news/2022-12-27-alternatives-introduction/2022-12-27-alternatives-introduction.ru.txt
@@ -62,8 +62,9 @@ FEATURES="-collision-protect". collision-protect находит конфликт
 Для миграции достаточно убрать eselect-awk и eselect-sh из world, и обновить
 систему как обычно:
 1. # emerge --deselect app-eselect/eselect-awk app-eselect/eselect-sh
-2. # emerge --sync
-3. # emerge -a -uvDU @world (или похожая команда для стандартного обновления
+2. # emerge --depclean app-eselect/eselect-awk app-eselect/eselect-sh
+3. # emerge --sync
+4. # emerge -a -uvDU @world (или похожая команда для стандартного обновления
 системы)
 
 ## Конфигурация
@@ -81,11 +82,11 @@ FEATURES="-collision-protect". collision-protect находит конфликт
 app-alternatives, таких как app-alternatives/sh, и настройте их на ваше
 усмотрение.
 
-Например, чтобы /usr/bin/gzip был предоставлен пакетом app-arch/pigz, это
+Например, чтобы /bin/gzip был предоставлен пакетом app-arch/pigz, это
 автоматически параллелизует gzip, нужен такой текст в /etc/portage/package.use:
 ```
 # https://wiki.gentoo.org/wiki/Gzip#Parallelization
-# Пусть /usr/bin/gzip будет ссылкой на pigz для ускорения сжатия
+# Пусть /bin/gzip будет ссылкой на pigz для ускорения сжатия
 app-alternatives/gzip -reference pigz
 ```
 
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index af28f668ecd3..819b9b40a511 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 14957 BLAKE2B 9b4a03ca2cdc8f82e8ab0ff86e202f41bc656dfa94465b3e5b62bc19534daa77f55dc7405a186f6b488f4483c8749474d8f41f7ed8a1536defa430296169f75c SHA512 d1c22be85e8691b1423545a48181e744214018a78cadc138413a31185e3de1f748483fef9f118db4af4a5d7078bd64191943df29aa15734a49fd3092d97dac34
-TIMESTAMP 2022-12-28T13:09:46Z
+MANIFEST Manifest.files.gz 14950 BLAKE2B 792d84278cbe0a78d43b0cbb185ce7da147c07c1faedbacd7778de8536404dd2ec06d331e0958b852e139d4f3aeefcd8741db7653ef0e8e10d007dc8fa05b9a0 SHA512 3c8e9c9c1402b1f78060806a88692459aaec8ee174db356633010b585f8cae388bd62391f0982b36f56334725d482889e3a10511f24a2d0abf2fd1f9a3601110
+TIMESTAMP 2022-12-28T19:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOsQBpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOslHpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBFtBAAl9LwHo6W5xQ3Iplfnp3NPnUAQ6xEZpJY7/pDKwa5vhb3M1iFmaZ7GWJM
-YQrjAo2Kus9rorCdFXajmf5VBntPhU478MgAXxJ0JyeAISKtX8pQ5hMlFJoaRt/r
-TyxCMf6Qwmpb7gawwrEcwSpG+2S+ra6OOU4o8GP3ATKdwSlWShd0t32nR0uZKOk4
-Dn4YXH0JtWhxbrida6qXdKV9k6kbW/UyQjk+ge4bVgibW2Io6SnssiGbtBczqP13
-sIWpN38Z1XKIBBk1N9vJaN70knvNSwuVZiZZmfSNwAnAs7gzju1JtyhcqoiR31XJ
-dwSREgN/JiVT9hyfeH6uIniLBC/LQI+OZEemlcFYeiPN8lL6S/zHoywn+167Zksu
-h7ry0leMAkxcKagbBI+owmwTLlfRDW1zZ5wKQFhWTC1eM/Q3LNIoOxVeQa7La8Ql
-ArRZ5wjjaGcpB/CLf5UoZQLaSPAnVAhuZYfdzooZ2F/pYaSCpuvq34GuE2DCrNgG
-xp6mmVObZyy//c6WNzZpNZwsg7cDezTf/a7yiMuyTTUiCTnUEHIRwS55IVmk8HHt
-aSoL3rRSrRJeInbo8NQjQJxqQWX2rqbBrYAegXKj8J6HAhWh0JVDKNMw7+EEJLtm
-KvpchGriDvZvCd1oFFPAwU+DL3gxZ+guVNdy0bSQoUjsYHC98Js=
-=+q/8
+klCzFA//c4UZK6i5ASe/tcrVNRqTeNpGmJ4a9FRTSUXY00zWxWycKSsVs6RmV+Ag
+wl3l8Vx4tbCSuQWWfp9ewFG+Y7m8tA8ccioSZxBjA9Jf5hzbnwQW48F2YZazK+RH
+ZyF4UmUJ40qmVxBlKW4iidSP8unpeb++br0/QJa1t0oOmSFT1n+3Yeqs2/eeIyS9
+So3qu+vFUDi9UI5+NM0pa7r7aDq/vA7043FUcwwqME6DWbj1ewVbm6T5xfK/wPxr
+iYL7yCmdZAqOf1yDIqbDxwu6O7hcgQT7HyXA18Jo2ruC8m9C7RxLyrq/Y+ACUvvY
+qfOxhtEB0w7U1WJw3MY7X1/zHkj5u2imJUgNnNXucx8D4GEUDEakwuxvvZjKlHp6
+5E9D3I3o/npUlZuC9lv+IkNmBLaN2RBgjfFonHT1z3Ie5jyDQ4xxDzG/VyYtuCOI
+8XBQPkmTzQPKXfBRoNbh6RrDD6LnU6oU7coUhpeD5tb2eH+odOg4HNB05xwVld+p
+LOGcYYG8hGbhP1OS2AZyOf5sKN2hdMdnYpI40MDUjcho2pj0us2DPiaeTZY6b+pJ
+OH3j6FLrmPmFyQDACy1IKyEM1DqbAC2Z23WJDrSlweTmKWF56p3Uq3hHn506xmg6
+Tg7nNrXhzB6u5Kgd2CPPkDxKaQ/GD2xtaCw8FtI4rxXyF7DT9aQ=
+=TbPP
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index d53933f4cd48..dd81a1c939d6 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 73f4542b449f..218dfa66fe48 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Dec 2022 13:09:42 +0000
+Wed, 28 Dec 2022 19:09:43 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 6fb3057a9078..92553990a6b3 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-e9411435f572e21fb37e58f9560ae1f733d36f8b 1672188577 2022-12-28T00:49:37+00:00
+438d35b13f626ee69e26033c5f9cf829429fecc4 1672244253 2022-12-28T16:17:33+00:00
diff --git a/metadata/timestamp b/metadata/timestamp
index 3a097192eaf3..c246159ff056 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Dec 28 01:09:42 PM UTC 2022
+Wed Dec 28 07:09:42 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 338ccff0fdd4..10e23ed52c0b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Dec 2022 13:15:01 +0000
+Wed, 28 Dec 2022 19:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 9d81a8af9fb5..8b30580252c9 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-38531ad6598d88264a238301e39efd9bc663eba4 1672229830 2022-12-28T12:17:10+00:00
+8a71794f106aa0cf9eae4036f33a56a95d8e04ec 1672253972 2022-12-28T18:59:32+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9ebff6512160..ff5492db03b3 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1672233002 Wed 28 Dec 2022 01:10:02 PM UTC
+1672254601 Wed 28 Dec 2022 07:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 73f4542b449f..05e6b81a0b77 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Dec 2022 13:09:42 +0000
+Wed, 28 Dec 2022 19:09:42 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 399a4372dd07..4c789ed31862 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 9fd9289d3821..6e81251be256 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -3,9 +3,7 @@ AUX nsd.initd-r1 1383 BLAKE2B b90de2ebef09a4f9050f6e95f5faf659c62910462aba1179da
 AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1df39ceb58b92a44c48cb21583a480e622f72d07650f410f2e0703f1d16af08152aed16982ab8da2 SHA512 c06d0b035387e7be79cfa8fedf8afb3900772146c6d4090ac39ea2ef165772d875b222ef467bd73422078ef57818bcc931ca67fa290bd99a7a9456efa5448853
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
-DIST nsd-4.5.0.tar.gz 1259059 BLAKE2B 5c90a17b2c2df3cf06bea2609fb02198b4fdde3e9ed7cc0a07526d43069f735458a0c1775fc7b45ac7bd1fba42ec329fe5b67378d6282bf86f6c520f73b00397 SHA512 0309e1ff083b6f2118ba6fd59425319c21f31558d30e17a40eb8f1e53dee9e3e766d7b53eb50462130ba17b454a3559dc786d344cb779468d255732bbc6bc5da
 DIST nsd-4.6.1.tar.gz 1281583 BLAKE2B 5eff5560ce16451a57905bb9d979c81918b6b55f72e1f1b89ab8d2e479ac36bf4f95152c77b1f1b3ce0af90bde8f25d2cad7226450c5cbc879f112adea2b3a69 SHA512 cab557a20cf8564cbf6e38405ca28b00baa6e14105527c3b16f49f57fed5e39cdb2bcd62999bad4aff2c69e0967bdba66a1eaa7b73a0d4d99d97535cc5860bfe
-EBUILD nsd-4.5.0.ebuild 3173 BLAKE2B cca1e177b819ce44e8c8f8c81ca86b0e8c53540d4db3283eefd4c5a9008620dd9b741441df7a519102318feb8409a4fee5a1c9cec28b1b53e1a71df46d953e4b SHA512 8748426d1a5bc96acc5a98b7e070c4db2c7d12d3162410330ff4434063f8555582f3968bbb8b6b19d9d19bebe2e820400f2699c1a406c83814c56506815cb5b1
 EBUILD nsd-4.6.1-r1.ebuild 3209 BLAKE2B 389c985799ffa9042b6068090e361474ea3ed46d1e4011331db85b89260229801e7af8c6c0bbb00a086dec5598cc0b225ddf4546a7da5dc490146d54d7bde2ed SHA512 67cc70e82fa0c2b8bd236867b58eca15951c819c5446bb2d336e73458c193e4eae1f192c620b0eea6b7183fc1da012651abdc64bd363373a8cb12a8863ffb094
 EBUILD nsd-9999.ebuild 3162 BLAKE2B a506ee3a9304ced1bb2dc9d2705b30d0101a76d06780d3007eb404610ce95143ba1964c4516182de2b406ef3515c3cc1dc695ac0e118d52649b85e7f043a21a1 SHA512 0a20625bcd3e1fbf2563f16253d71b728603879a8bdbcea80bdee41bbc74a11ed2c15154b197f2e69b6b255cec452e0f22c082f640db4017c982dafdb5a4a793
-MISC metadata.xml 1077 BLAKE2B 81ba4f798150f077bf01a0c901f6552ce3b56dd54efa5c988206c956c58674d2f4fd9e046e4cddb5ad798aea1c5cb59ad1e6d7b0ea250fe297167fd1dcc5c3a5 SHA512 8c105314e496ec71c847a1768cefa12b2bcdad2f00e38fca0e90a1b2f2a66b26b271a17c883a5d1be9dd66190477c0e0e67b0412699c2ca34a2f6655e3e55b36
+MISC metadata.xml 970 BLAKE2B bdadf7cb1a1a444aff44b9f1ad7ea64a5b01d72888d91662f55cb321a94f8b03ea9f050e78df9cc2a81e2c538a81d463c95f998b8c7f65c192425d3a5917a25e SHA512 bc769f335f452a8f81f83d8333bf3db11620212b156eac80ddd9622312605b80b56d4fa6ebdb609b7c1999cc995672350b0181666c012ee69e21ff5b511af48d
diff --git a/net-dns/nsd/metadata.xml b/net-dns/nsd/metadata.xml
index f4238fbfaaf3..73010eb2f935 100644
--- a/net-dns/nsd/metadata.xml
+++ b/net-dns/nsd/metadata.xml
@@ -14,8 +14,6 @@
 		<flag name="ratelimit">Enables ratelimiting, based on query name,
 			type and source</flag>
 		<flag name="root-server">Configure NSD as a root server</flag>
-		<flag name="runtime-checks">Enable runtime checks, this could lead 
-			to a reduced service level</flag>
 		<flag name="munin">
 			Install a plugin for <pkg>net-analyzer/munin</pkg> to graph
 			statistical data from nsd.</flag>
diff --git a/net-dns/nsd/nsd-4.5.0.ebuild b/net-dns/nsd/nsd-4.5.0.ebuild
deleted file mode 100644
index 4f654418871a..000000000000
--- a/net-dns/nsd/nsd-4.5.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-LICENSE="BSD"
-SLOT="0"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git"
-else
-	# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-	MY_PV="${PV/_beta/b}"
-	MY_PV="${MY_PV/_rc/rc}"
-	MY_P="${PN}-${MY_PV}"
-
-	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="amd64 x86"
-	SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
-
-RDEPEND="
-	acct-group/nsd
-	acct-user/nsd
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	libevent? ( dev-libs/libevent )
-	munin? ( net-analyzer/munin )
-	ssl? ( dev-libs/openssl:0= )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	app-alternatives/yacc
-	systemd? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	# Fix the paths in the munin plugin to match our install
-	"${FILESDIR}"/nsd_munin_.patch
-)
-
-src_prepare() {
-	default
-	# Required to get correct pkg-config macros with USE="systemd"
-	# see bugs #663618 and #758050
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-largefile
-		--enable-pie
-		--enable-relro-now
-		--enable-tcp-fastopen
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
-		--with-logfile="${EPREFIX}"/var/log/nsd.log
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
-		--with-xfrdir="${EPREFIX}"/var/db/nsd
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd
-		$(use_enable bind8-stats)
-		$(use_enable bind8-stats zone-stats)
-		$(use_enable dnstap)
-		$(use_enable ipv6)
-		$(use_enable minimal-responses)
-		$(use_enable mmap)
-		$(use_enable nsec3)
-		$(use_enable ratelimit)
-		$(use_enable root-server)
-		$(use_enable runtime-checks checking)
-		$(use_enable systemd)
-		$(use_with libevent)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-
-	keepdir /var/db/${PN}
-}
-
-pkg_postinst() {
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
-}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index e8949d9080b3..b87ad8e574db 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -9,5 +9,8 @@ AUX unbound.socket 101 BLAKE2B 4885d311873d7f3e5daf1c0a63798b13761b7c0bfb1bead0b
 AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a73b0c6148f4df336c4c07e8da19320df6bedb49cb6884da565543f78456d38dc3000ca2a1abde84816be SHA512 71bd8c422ffe57e448b66f97775075a407671757266d40294a670b41cd1a59f16b65488d30aa74b79b7536f0c4c50adb56e32377e8029fd6c327b85c022c5fe3
 DIST unbound-1.16.3.tar.gz 6204330 BLAKE2B b97deade78ab903363e06ff9d71b9895c754378ec276bb17556de62c48a88af5fbabd26f97fb47313d1e631fe75dee245aa38fbf42a865ac3e764882a1124a51 SHA512 ef5cda926dd1082a750615d8687bccd756869c66e9f24f984fda4c6613f94f3e4884db328b8d7b490777a75d3e616dcb61c5258e7777923c0590e6fabacd207c
 DIST unbound-1.16.3.tar.gz.asc 833 BLAKE2B 2009dac660405b11725c046099cf9bd2f6ccea0bda8936530228b6ab3ceebfadd119b5d91ff1c86845d54444104f578597a574daed80a5e6e677c8f7d68b789b SHA512 b106f080d877e479d944a7ebe24a380f4c40c38308733f43f8a60d4e7aedc6597e6daa4a1428f596e705c9c75e6ee7b4187dbbc5750a9c406f59d76d4f1b4a8d
+DIST unbound-1.17.0.tar.gz 6235060 BLAKE2B 611c1b96ff84e6dd8f7a592135cc17f416cd810d0f35d27c8cedd56af069badd8dca112cc5927a1fe50ec3335c377b6bd6fc4e1a6d63a332a90d676e3c23dcef SHA512 f6b9f279330fb19b5feca09524959940aad8c4e064528aa82b369c726d77e9e8e5ca23f366f6e9edcf2c061b96f482ed7a2c26ac70fc15ae5762b3d7e36a5284
+DIST unbound-1.17.0.tar.gz.asc 833 BLAKE2B 8b77a16fa1287af7c12720cce0b45c1ab49f691a0516674d28009d5da8c71d5d56a9518e16fb752c2db58dc835223d55ff863bfc03971aa408eb0f65a65600bf SHA512 e1567f088bdf0a96dbdcf365deccb72f42319b9b29510d5d9aefbe66df054446d3dcdfcc54826046af6e4f751aa518798b968685611b1b7f1860f66a96e32a57
 EBUILD unbound-1.16.3.ebuild 6524 BLAKE2B 3b870572ab0f226bb191391c633d5888bf3258c020b23e6f836c84b151689a9fda72ed330dc87d77c48815ea8b83c7208bca071dd48bd1fd170cc6a71fb917d2 SHA512 d520a7308ba1a5b925d39fb34b9f4c1844fb479f8f5d44cd9ca694f93b6f9b07c96e9734fee6d20efb02d6c63f4c3f7732151ddce16b81e572476889b86ede1d
+EBUILD unbound-1.17.0.ebuild 6530 BLAKE2B 6e159a8c8525bb593acc185f43a74fe53231fe2002ef66809679b298a0f556e50595b75defb3bdab48d05707dd7c3cc4cccef23a91bfb49c8d44854d8620f81e SHA512 830ceec500b5cc73f448097adda0da392b5e5a905aee6cceb187949c2725a92320607cb50e1b2f36e549fbb76a11f659ec5bb946d46a43a59a1b97b38697a4d5
 MISC metadata.xml 1475 BLAKE2B d0e34f4ba056c090af979f2686d5dece53a554c7ea7612fee1991ce6838ce161359bd8405d6358c5e184b6721affeee5d6e1bd93095b92765cd38dba928daa5b SHA512 8fba72eba420d4c06fb3a9119c3f324c5679fe268b65fac23878ef15f3c3d784d372874c7d6428d1c7c2eb3a75380ad2e4d5fc1691e7c2d1b426b8cfa381222b
diff --git a/net-dns/unbound/unbound-1.17.0.ebuild b/net-dns/unbound/unbound-1.17.0.ebuild
new file mode 100644
index 000000000000..ccc9419c7b78
--- /dev/null
+++ b/net-dns/unbound/unbound-1.17.0.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz
+	verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc )"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/unbound.net.asc
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND="acct-group/unbound
+	acct-user/unbound
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+	dnscrypt? ( dev-libs/libsodium:=[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1:=[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		dev-libs/openssl:0[-bindist(-)]
+	)
+	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )
+	systemd? ( sys-apps/systemd )
+"
+
+BDEPEND="virtual/pkgconfig
+	python? ( dev-lang/swig )
+	test? (
+		|| (
+			net-libs/ldns[examples(-)]
+			net-dns/ldns-utils[examples(-)]
+		)
+		dev-util/splint
+		app-text/wdiff
+	)
+	verify-sig? ( sec-keys/openpgp-keys-unbound )
+"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+	"${FILESDIR}"/${PN}-1.10.1-find-ar.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(multilib_native_use_enable debug) \
+		$(multilib_native_use_enable gost) \
+		$(multilib_native_use_enable dnscrypt) \
+		$(multilib_native_use_enable dnstap) \
+		$(multilib_native_use_enable ecdsa) \
+		$(multilib_native_use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(multilib_native_use_enable static-libs static) \
+		$(multilib_native_use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(multilib_native_use_with threads pthreads) \
+		$(multilib_native_use_with http2 libnghttp2) \
+		$(multilib_native_use_enable tfo tfo-client) \
+		$(multilib_native_use_enable tfo tfo-server) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--with-libevent="${ESYSROOT}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${ESYSROOT}"/usr \
+		--with-libexpat="${ESYSROOT}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit contrib/unbound.service
+	systemd_dounit contrib/unbound.socket
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	fowners root:unbound /etc/unbound/var
+	fperms 0770 /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED}/etc/unbound/unbound.conf" \
+		|| die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0770 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]] ; then
+		einfo "Trying to create unbound control key ..."
+		if ! unbound-control-setup &>/dev/null ; then
+			ewarn "Failed to create unbound control key!"
+		fi
+	fi
+
+	if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]] ; then
+		einfo ""
+		einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+		einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
+		einfo "and run"
+		einfo ""
+		einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
+		einfo ""
+		einfo "as root to create it initially before starting unbound for the first time after enabling this."
+		einfo ""
+	fi
+
+	# Our user is not available on prefix
+	use prefix && return
+
+	local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null
+	if [ $? -ne 0 ] ; then
+		ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!"
+		ewarn "Run the following commands to restore default permission:"
+		ewarn ""
+		ewarn "    chown root:unbound ${EPREFIX}/etc/unbound/var"
+		ewarn "    chmod 0770 ${EPREFIX}/etc/unbound/var"
+	else
+		# Cleanup -- no reason to die here!
+		rm -f "${_perm_check_testfile}"
+	fi
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 263aa64f66c0..24ad4926ef03 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/packages b/profiles/base/packages
index e0cee163af99..43b1f069add7 100644
--- a/profiles/base/packages
+++ b/profiles/base/packages
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
 # Gentoo Base Profile
@@ -24,6 +24,11 @@
 # of the minimum set of packages needed for any Gentoo based system.
 
 *>=sys-apps/baselayout-2
+*app-alternatives/awk
+*app-alternatives/bzip2
+*app-alternatives/gzip
+*app-alternatives/sh
+*app-alternatives/tar
 *app-admin/eselect
 *app-arch/bzip2
 *app-arch/gzip
diff --git a/profiles/default/linux/riscv/23.0/rv32/eapi b/profiles/default/linux/riscv/23.0/rv32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv32/ilp32/eapi b/profiles/default/linux/riscv/23.0/rv32/ilp32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv32/ilp32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv32/ilp32/parent b/profiles/default/linux/riscv/23.0/rv32/ilp32/parent
new file mode 100644
index 000000000000..a29c20c15237
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv32/ilp32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/riscv/rv32imac/ilp32
diff --git a/profiles/default/linux/riscv/23.0/rv32/ilp32d/eapi b/profiles/default/linux/riscv/23.0/rv32/ilp32d/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv32/ilp32d/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv32/ilp32d/parent b/profiles/default/linux/riscv/23.0/rv32/ilp32d/parent
new file mode 100644
index 000000000000..f30144c36328
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv32/ilp32d/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/riscv/rv32imac/ilp32d
diff --git a/profiles/default/linux/riscv/23.0/rv32/parent b/profiles/default/linux/riscv/23.0/rv32/parent
new file mode 100644
index 000000000000..2995716f47b8
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv32/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../releases/23.0
diff --git a/profiles/default/linux/riscv/23.0/rv32/split-usr/eapi b/profiles/default/linux/riscv/23.0/rv32/split-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv32/split-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv32/split-usr/ilp32/eapi b/profiles/default/linux/riscv/23.0/rv32/split-usr/ilp32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv32/split-usr/ilp32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv32/split-usr/ilp32/parent b/profiles/default/linux/riscv/23.0/rv32/split-usr/ilp32/parent
new file mode 100644
index 000000000000..f8ab4052eff5
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv32/split-usr/ilp32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/riscv/rv32imac/ilp32
diff --git a/profiles/default/linux/riscv/23.0/rv32/split-usr/ilp32d/eapi b/profiles/default/linux/riscv/23.0/rv32/split-usr/ilp32d/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv32/split-usr/ilp32d/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv32/split-usr/ilp32d/parent b/profiles/default/linux/riscv/23.0/rv32/split-usr/ilp32d/parent
new file mode 100644
index 000000000000..b589764e6ccb
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv32/split-usr/ilp32d/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/riscv/rv32imac/ilp32d
diff --git a/profiles/default/linux/riscv/23.0/rv32/split-usr/parent b/profiles/default/linux/riscv/23.0/rv32/split-usr/parent
new file mode 100644
index 000000000000..252810268290
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv32/split-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/split-usr
diff --git a/profiles/default/linux/riscv/23.0/rv64/eapi b/profiles/default/linux/riscv/23.0/rv64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/gnome/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/gnome/parent b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/gnome/parent
new file mode 100644
index 000000000000..d5a56a13f692
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/gnome/systemd/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/gnome/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/gnome/systemd/parent b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..288aeccdce82
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/parent b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/parent
new file mode 100644
index 000000000000..fae96e8d36b2
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/plasma/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/plasma/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/plasma/parent b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/plasma/parent
new file mode 100644
index 000000000000..0317df26cc9b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/plasma/systemd/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/plasma/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/plasma/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/plasma/systemd/parent b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/plasma/systemd/parent
new file mode 100644
index 000000000000..5d9d87f6d91e
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/plasma/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/systemd/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/systemd/parent b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/systemd/parent
new file mode 100644
index 000000000000..f7739b405877
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/desktop/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/musl/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64/musl/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/musl/make.defaults b/profiles/default/linux/riscv/23.0/rv64/lp64/musl/make.defaults
new file mode 100644
index 000000000000..654f67c08811
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/musl/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="riscv64-gentoo-linux-musl"
+
+CHOST_lp64="riscv64-gentoo-linux-musl"
+
+LIBDIR_lp64="lib"
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/musl/parent b/profiles/default/linux/riscv/23.0/rv64/lp64/musl/parent
new file mode 100644
index 000000000000..b488e1ca01b8
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/musl
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/parent b/profiles/default/linux/riscv/23.0/rv64/lp64/parent
new file mode 100644
index 000000000000..0273fe595371
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/riscv/rv64gc/lp64
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/systemd/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64/systemd/parent b/profiles/default/linux/riscv/23.0/rv64/lp64/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/gnome/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/gnome/parent b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/gnome/parent
new file mode 100644
index 000000000000..d5a56a13f692
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/gnome/systemd/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/gnome/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/gnome/systemd/parent b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..288aeccdce82
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/parent b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/parent
new file mode 100644
index 000000000000..fae96e8d36b2
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/plasma/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/plasma/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/plasma/parent b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/plasma/parent
new file mode 100644
index 000000000000..0317df26cc9b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/plasma/systemd/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/plasma/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/plasma/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/plasma/systemd/parent b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/plasma/systemd/parent
new file mode 100644
index 000000000000..5d9d87f6d91e
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/plasma/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/systemd/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/systemd/parent b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/systemd/parent
new file mode 100644
index 000000000000..f7739b405877
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/desktop/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64d/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/musl/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64d/musl/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/musl/make.defaults b/profiles/default/linux/riscv/23.0/rv64/lp64d/musl/make.defaults
new file mode 100644
index 000000000000..e63b33d06f48
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/musl/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="riscv64-gentoo-linux-musl"
+
+CHOST_lp64d="riscv64-gentoo-linux-musl"
+
+LIBDIR_lp64d="lib"
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/musl/parent b/profiles/default/linux/riscv/23.0/rv64/lp64d/musl/parent
new file mode 100644
index 000000000000..b488e1ca01b8
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/musl
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/parent b/profiles/default/linux/riscv/23.0/rv64/lp64d/parent
new file mode 100644
index 000000000000..f497f659b838
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/riscv/rv64gc/lp64d
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/prefix/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64d/prefix/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/prefix/kernel-3.2+/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64d/prefix/kernel-3.2+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/prefix/kernel-3.2+/parent b/profiles/default/linux/riscv/23.0/rv64/lp64d/prefix/kernel-3.2+/parent
new file mode 100644
index 000000000000..df2c40188f35
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/prefix/standalone
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/prefix/parent b/profiles/default/linux/riscv/23.0/rv64/lp64d/prefix/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/systemd/eapi b/profiles/default/linux/riscv/23.0/rv64/lp64d/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/lp64d/systemd/parent b/profiles/default/linux/riscv/23.0/rv64/lp64d/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/lp64d/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/23.0/rv64/multilib/eapi b/profiles/default/linux/riscv/23.0/rv64/multilib/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/multilib/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/multilib/parent b/profiles/default/linux/riscv/23.0/rv64/multilib/parent
new file mode 100644
index 000000000000..eef8b55d0efc
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/multilib/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/riscv/rv64gc/lp64d-multilib
diff --git a/profiles/default/linux/riscv/23.0/rv64/multilib/systemd/eapi b/profiles/default/linux/riscv/23.0/rv64/multilib/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/multilib/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/multilib/systemd/parent b/profiles/default/linux/riscv/23.0/rv64/multilib/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/multilib/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/23.0/rv64/parent b/profiles/default/linux/riscv/23.0/rv64/parent
new file mode 100644
index 000000000000..2995716f47b8
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../releases/23.0
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/eapi b/profiles/default/linux/riscv/23.0/rv64/split-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/eapi b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/gnome/eapi b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/gnome/parent b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/gnome/parent
new file mode 100644
index 000000000000..b34bc39063e0
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/parent b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/parent
new file mode 100644
index 000000000000..b2a33c35daf9
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/plasma/eapi b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/plasma/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/plasma/parent b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/plasma/parent
new file mode 100644
index 000000000000..04c17e07380e
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/eapi b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/musl/eapi b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/musl/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/musl/make.defaults b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/musl/make.defaults
new file mode 100644
index 000000000000..654f67c08811
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/musl/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="riscv64-gentoo-linux-musl"
+
+CHOST_lp64="riscv64-gentoo-linux-musl"
+
+LIBDIR_lp64="lib"
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/musl/parent b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/musl/parent
new file mode 100644
index 000000000000..f5ec1675641c
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/musl
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/parent b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/parent
new file mode 100644
index 000000000000..91f61e248c13
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/riscv/rv64gc/lp64
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/eapi b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/gnome/eapi b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/gnome/parent b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/gnome/parent
new file mode 100644
index 000000000000..b34bc39063e0
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/parent b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/parent
new file mode 100644
index 000000000000..b2a33c35daf9
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/plasma/eapi b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/plasma/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/plasma/parent b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/plasma/parent
new file mode 100644
index 000000000000..04c17e07380e
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/eapi b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/musl/eapi b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/musl/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/musl/make.defaults b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/musl/make.defaults
new file mode 100644
index 000000000000..e63b33d06f48
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/musl/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="riscv64-gentoo-linux-musl"
+
+CHOST_lp64d="riscv64-gentoo-linux-musl"
+
+LIBDIR_lp64d="lib"
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/musl/parent b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/musl/parent
new file mode 100644
index 000000000000..f5ec1675641c
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/musl
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/parent b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/parent
new file mode 100644
index 000000000000..8702001bd463
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/riscv/rv64gc/lp64d
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/prefix/eapi b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/prefix/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/prefix/kernel-3.2+/eapi b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/prefix/kernel-3.2+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/prefix/kernel-3.2+/parent b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/prefix/kernel-3.2+/parent
new file mode 100644
index 000000000000..ee4c4d5f7056
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/prefix/standalone
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/prefix/parent b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/prefix/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/multilib/eapi b/profiles/default/linux/riscv/23.0/rv64/split-usr/multilib/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/multilib/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/multilib/parent b/profiles/default/linux/riscv/23.0/rv64/split-usr/multilib/parent
new file mode 100644
index 000000000000..ae8cc65cdaa0
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/multilib/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/riscv/rv64gc/lp64d-multilib
diff --git a/profiles/default/linux/riscv/23.0/rv64/split-usr/parent b/profiles/default/linux/riscv/23.0/rv64/split-usr/parent
new file mode 100644
index 000000000000..252810268290
--- /dev/null
+++ b/profiles/default/linux/riscv/23.0/rv64/split-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/split-usr
diff --git a/profiles/default/linux/s390/23.0/eapi b/profiles/default/linux/s390/23.0/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/s390/23.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/s390/23.0/parent b/profiles/default/linux/s390/23.0/parent
new file mode 100644
index 000000000000..d624eaec521f
--- /dev/null
+++ b/profiles/default/linux/s390/23.0/parent
@@ -0,0 +1,2 @@
+../../../../releases/23.0
+..
diff --git a/profiles/default/linux/s390/23.0/s390x/eapi b/profiles/default/linux/s390/23.0/s390x/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/s390/23.0/s390x/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/s390/23.0/s390x/parent b/profiles/default/linux/s390/23.0/s390x/parent
new file mode 100644
index 000000000000..a31aae5e41bb
--- /dev/null
+++ b/profiles/default/linux/s390/23.0/s390x/parent
@@ -0,0 +1,4 @@
+../../../../../base
+../../../../../releases/23.0
+../../..
+../../../../../arch/s390/s390x
diff --git a/profiles/default/linux/s390/23.0/s390x/systemd/eapi b/profiles/default/linux/s390/23.0/s390x/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/s390/23.0/s390x/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/s390/23.0/s390x/systemd/parent b/profiles/default/linux/s390/23.0/s390x/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/s390/23.0/s390x/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/default/linux/s390/23.0/split-usr/eapi b/profiles/default/linux/s390/23.0/split-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/s390/23.0/split-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/s390/23.0/split-usr/parent b/profiles/default/linux/s390/23.0/split-usr/parent
new file mode 100644
index 000000000000..598ca888c8c2
--- /dev/null
+++ b/profiles/default/linux/s390/23.0/split-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/split-usr
diff --git a/profiles/default/linux/s390/23.0/split-usr/s390x/eapi b/profiles/default/linux/s390/23.0/split-usr/s390x/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/s390/23.0/split-usr/s390x/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/s390/23.0/split-usr/s390x/parent b/profiles/default/linux/s390/23.0/split-usr/s390x/parent
new file mode 100644
index 000000000000..ced716045c37
--- /dev/null
+++ b/profiles/default/linux/s390/23.0/split-usr/s390x/parent
@@ -0,0 +1,4 @@
+../../../../../../base
+../../../../../../releases/23.0
+../../../..
+../../../../../../arch/s390/s390x
diff --git a/profiles/default/linux/s390/23.0/systemd/eapi b/profiles/default/linux/s390/23.0/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/s390/23.0/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/s390/23.0/systemd/parent b/profiles/default/linux/s390/23.0/systemd/parent
new file mode 100644
index 000000000000..ced72403bde9
--- /dev/null
+++ b/profiles/default/linux/s390/23.0/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/systemd
diff --git a/profiles/default/linux/sparc/23.0/64ul/desktop/eapi b/profiles/default/linux/sparc/23.0/64ul/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/64ul/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/23.0/64ul/desktop/parent b/profiles/default/linux/sparc/23.0/64ul/desktop/parent
new file mode 100644
index 000000000000..db8ce088c69a
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/64ul/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/profiles/default/linux/sparc/23.0/64ul/eapi b/profiles/default/linux/sparc/23.0/64ul/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/64ul/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/23.0/64ul/package.use.mask b/profiles/default/linux/sparc/23.0/64ul/package.use.mask
new file mode 100644
index 000000000000..b78918f9457d
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/64ul/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Mike Frysinger <vapier@gentoo.org> (2014-10-21)
+# This target supports ASAN/etc... #504200.
+sys-devel/gcc -sanitize
diff --git a/profiles/default/linux/sparc/23.0/64ul/parent b/profiles/default/linux/sparc/23.0/64ul/parent
new file mode 100644
index 000000000000..67d01b34bcd4
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/64ul/parent
@@ -0,0 +1,5 @@
+../../../../../base
+../../../../../releases/23.0
+../../..
+../../../../../features/multilib
+../../../../../arch/sparc/64ul
diff --git a/profiles/default/linux/sparc/23.0/64ul/systemd/eapi b/profiles/default/linux/sparc/23.0/64ul/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/64ul/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/23.0/64ul/systemd/parent b/profiles/default/linux/sparc/23.0/64ul/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/64ul/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/default/linux/sparc/23.0/desktop/eapi b/profiles/default/linux/sparc/23.0/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/23.0/desktop/parent b/profiles/default/linux/sparc/23.0/desktop/parent
new file mode 100644
index 000000000000..ad6c5e126fbb
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/desktop
diff --git a/profiles/default/linux/sparc/23.0/eapi b/profiles/default/linux/sparc/23.0/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/23.0/parent b/profiles/default/linux/sparc/23.0/parent
new file mode 100644
index 000000000000..1f1f7af0ded9
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/parent
@@ -0,0 +1,4 @@
+..
+../../../../releases/23.0
+../../../../features/multilib
+../../../../arch/sparc/32ul
diff --git a/profiles/default/linux/sparc/23.0/split-usr/64ul/desktop/eapi b/profiles/default/linux/sparc/23.0/split-usr/64ul/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/split-usr/64ul/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/23.0/split-usr/64ul/desktop/parent b/profiles/default/linux/sparc/23.0/split-usr/64ul/desktop/parent
new file mode 100644
index 000000000000..fae96e8d36b2
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/split-usr/64ul/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/profiles/default/linux/sparc/23.0/split-usr/64ul/eapi b/profiles/default/linux/sparc/23.0/split-usr/64ul/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/split-usr/64ul/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/23.0/split-usr/64ul/package.use.mask b/profiles/default/linux/sparc/23.0/split-usr/64ul/package.use.mask
new file mode 100644
index 000000000000..b78918f9457d
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/split-usr/64ul/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Mike Frysinger <vapier@gentoo.org> (2014-10-21)
+# This target supports ASAN/etc... #504200.
+sys-devel/gcc -sanitize
diff --git a/profiles/default/linux/sparc/23.0/split-usr/64ul/parent b/profiles/default/linux/sparc/23.0/split-usr/64ul/parent
new file mode 100644
index 000000000000..dfc929222bef
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/split-usr/64ul/parent
@@ -0,0 +1,6 @@
+../../../../../../base
+../../../../../../releases/23.0
+../../../..
+../../../../../../features/split-usr
+../../../../../../features/multilib
+../../../../../../arch/sparc/64ul
diff --git a/profiles/default/linux/sparc/23.0/split-usr/desktop/eapi b/profiles/default/linux/sparc/23.0/split-usr/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/split-usr/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/23.0/split-usr/desktop/parent b/profiles/default/linux/sparc/23.0/split-usr/desktop/parent
new file mode 100644
index 000000000000..db8ce088c69a
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/split-usr/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/profiles/default/linux/sparc/23.0/split-usr/eapi b/profiles/default/linux/sparc/23.0/split-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/split-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/23.0/split-usr/parent b/profiles/default/linux/sparc/23.0/split-usr/parent
new file mode 100644
index 000000000000..598ca888c8c2
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/split-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/split-usr
diff --git a/profiles/default/linux/sparc/23.0/systemd/eapi b/profiles/default/linux/sparc/23.0/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/23.0/systemd/parent b/profiles/default/linux/sparc/23.0/systemd/parent
new file mode 100644
index 000000000000..ced72403bde9
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/systemd
diff --git a/profiles/default/linux/sparc/23.0/use.mask b/profiles/default/linux/sparc/23.0/use.mask
new file mode 100644
index 000000000000..a7e3f10090f9
--- /dev/null
+++ b/profiles/default/linux/sparc/23.0/use.mask
@@ -0,0 +1,5 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# this is not a multilib profile
+multilib
diff --git a/profiles/default/linux/x86/23.0/desktop/eapi b/profiles/default/linux/x86/23.0/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/desktop/gnome/eapi b/profiles/default/linux/x86/23.0/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/desktop/gnome/parent b/profiles/default/linux/x86/23.0/desktop/gnome/parent
new file mode 100644
index 000000000000..6589a0e01478
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/x86/23.0/desktop/gnome/systemd/eapi b/profiles/default/linux/x86/23.0/desktop/gnome/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/desktop/gnome/systemd/parent b/profiles/default/linux/x86/23.0/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..f5c1ae438de4
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/x86/23.0/desktop/parent b/profiles/default/linux/x86/23.0/desktop/parent
new file mode 100644
index 000000000000..ad6c5e126fbb
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/desktop
diff --git a/profiles/default/linux/x86/23.0/desktop/plasma/eapi b/profiles/default/linux/x86/23.0/desktop/plasma/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/desktop/plasma/parent b/profiles/default/linux/x86/23.0/desktop/plasma/parent
new file mode 100644
index 000000000000..ff3a7b1ec814
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/x86/23.0/desktop/plasma/systemd/eapi b/profiles/default/linux/x86/23.0/desktop/plasma/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/desktop/plasma/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/desktop/plasma/systemd/parent b/profiles/default/linux/x86/23.0/desktop/plasma/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/desktop/plasma/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/x86/23.0/eapi b/profiles/default/linux/x86/23.0/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/hardened/eapi b/profiles/default/linux/x86/23.0/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/hardened/parent b/profiles/default/linux/x86/23.0/hardened/parent
new file mode 100644
index 000000000000..40a1173682f5
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/hardened/x86
diff --git a/profiles/default/linux/x86/23.0/hardened/selinux/eapi b/profiles/default/linux/x86/23.0/hardened/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/hardened/selinux/parent b/profiles/default/linux/x86/23.0/hardened/selinux/parent
new file mode 100644
index 000000000000..2190e9797eaa
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/selinux
diff --git a/profiles/default/linux/x86/23.0/musl/eapi b/profiles/default/linux/x86/23.0/musl/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/musl/make.defaults b/profiles/default/linux/x86/23.0/musl/make.defaults
new file mode 100644
index 000000000000..80515e7c892d
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/musl/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="i686-gentoo-linux-musl"
+CHOST_x86="${CHOST}"
diff --git a/profiles/default/linux/x86/23.0/musl/package.mask b/profiles/default/linux/x86/23.0/musl/package.mask
new file mode 100644
index 000000000000..ea771f7580c3
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/musl/package.mask
@@ -0,0 +1,2 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
diff --git a/profiles/default/linux/x86/23.0/musl/package.use.mask b/profiles/default/linux/x86/23.0/musl/package.use.mask
new file mode 100644
index 000000000000..b794980bdad7
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/musl/package.use.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
+
+# Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
+# The patch added for 5.39-r1 breaks on musl i686
+# file-5.39-seccomp_sandbox.patch is okay
+# file-5.39-portage_sandbox.patch is broken
+sys-apps/file seccomp
diff --git a/profiles/default/linux/x86/23.0/musl/parent b/profiles/default/linux/x86/23.0/musl/parent
new file mode 100644
index 000000000000..58651906cb67
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/musl
diff --git a/profiles/default/linux/x86/23.0/musl/selinux/eapi b/profiles/default/linux/x86/23.0/musl/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/musl/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/musl/selinux/parent b/profiles/default/linux/x86/23.0/musl/selinux/parent
new file mode 100644
index 000000000000..2190e9797eaa
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/musl/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/selinux
diff --git a/profiles/default/linux/x86/23.0/musl/use.force b/profiles/default/linux/x86/23.0/musl/use.force
new file mode 100644
index 000000000000..8e450e58d6d3
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/musl/use.force
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Many packages break without this, like app-arch/gzip
+pic
diff --git a/profiles/default/linux/x86/23.0/musl/use.mask b/profiles/default/linux/x86/23.0/musl/use.mask
new file mode 100644
index 000000000000..fe008ec19efd
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/musl/use.mask
@@ -0,0 +1,2 @@
+# Copyright 1999-2021 Gentoo Authors.
+# Distributed under the terms of the GNU General Public License, v2
diff --git a/profiles/default/linux/x86/23.0/parent b/profiles/default/linux/x86/23.0/parent
new file mode 100644
index 000000000000..50be433109ef
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/parent
@@ -0,0 +1,2 @@
+..
+../../../../releases/23.0
diff --git a/profiles/default/linux/x86/23.0/prefix/eapi b/profiles/default/linux/x86/23.0/prefix/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/eapi b/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/parent b/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/parent
new file mode 100644
index 000000000000..c4bb168d81b2
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/eapi b/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/parent b/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/parent
new file mode 100644
index 000000000000..b4882488fc0c
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/prefix/standalone/kernel-2.6.32+
diff --git a/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/eapi b/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/parent b/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/parent
new file mode 100644
index 000000000000..b8a505e58f6c
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/prefix/standalone
diff --git a/profiles/default/linux/x86/23.0/prefix/parent b/profiles/default/linux/x86/23.0/prefix/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/x86/23.0/split-usr/desktop/eapi b/profiles/default/linux/x86/23.0/split-usr/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/split-usr/desktop/gnome/eapi b/profiles/default/linux/x86/23.0/split-usr/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/split-usr/desktop/gnome/parent b/profiles/default/linux/x86/23.0/split-usr/desktop/gnome/parent
new file mode 100644
index 000000000000..9e06c4505a75
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/x86/23.0/split-usr/desktop/parent b/profiles/default/linux/x86/23.0/split-usr/desktop/parent
new file mode 100644
index 000000000000..db8ce088c69a
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/profiles/default/linux/x86/23.0/split-usr/desktop/plasma/eapi b/profiles/default/linux/x86/23.0/split-usr/desktop/plasma/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/split-usr/desktop/plasma/parent b/profiles/default/linux/x86/23.0/split-usr/desktop/plasma/parent
new file mode 100644
index 000000000000..00b252f479ce
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/x86/23.0/split-usr/eapi b/profiles/default/linux/x86/23.0/split-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/split-usr/hardened/eapi b/profiles/default/linux/x86/23.0/split-usr/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/split-usr/hardened/parent b/profiles/default/linux/x86/23.0/split-usr/hardened/parent
new file mode 100644
index 000000000000..178c392e9fe3
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/x86
diff --git a/profiles/default/linux/x86/23.0/split-usr/hardened/selinux/eapi b/profiles/default/linux/x86/23.0/split-usr/hardened/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/split-usr/hardened/selinux/parent b/profiles/default/linux/x86/23.0/split-usr/hardened/selinux/parent
new file mode 100644
index 000000000000..23c64bb44399
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/eapi b/profiles/default/linux/x86/23.0/split-usr/musl/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/make.defaults b/profiles/default/linux/x86/23.0/split-usr/musl/make.defaults
new file mode 100644
index 000000000000..80515e7c892d
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/musl/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="i686-gentoo-linux-musl"
+CHOST_x86="${CHOST}"
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/package.mask b/profiles/default/linux/x86/23.0/split-usr/musl/package.mask
new file mode 100644
index 000000000000..ea771f7580c3
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/musl/package.mask
@@ -0,0 +1,2 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/package.use.mask b/profiles/default/linux/x86/23.0/split-usr/musl/package.use.mask
new file mode 100644
index 000000000000..b794980bdad7
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/musl/package.use.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
+
+# Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
+# The patch added for 5.39-r1 breaks on musl i686
+# file-5.39-seccomp_sandbox.patch is okay
+# file-5.39-portage_sandbox.patch is broken
+sys-apps/file seccomp
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/parent b/profiles/default/linux/x86/23.0/split-usr/musl/parent
new file mode 100644
index 000000000000..5bbe8700f1a6
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/musl
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/selinux/eapi b/profiles/default/linux/x86/23.0/split-usr/musl/selinux/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/musl/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/selinux/parent b/profiles/default/linux/x86/23.0/split-usr/musl/selinux/parent
new file mode 100644
index 000000000000..23c64bb44399
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/musl/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/use.force b/profiles/default/linux/x86/23.0/split-usr/musl/use.force
new file mode 100644
index 000000000000..8e450e58d6d3
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/musl/use.force
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Many packages break without this, like app-arch/gzip
+pic
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/use.mask b/profiles/default/linux/x86/23.0/split-usr/musl/use.mask
new file mode 100644
index 000000000000..fe008ec19efd
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/musl/use.mask
@@ -0,0 +1,2 @@
+# Copyright 1999-2021 Gentoo Authors.
+# Distributed under the terms of the GNU General Public License, v2
diff --git a/profiles/default/linux/x86/23.0/split-usr/parent b/profiles/default/linux/x86/23.0/split-usr/parent
new file mode 100644
index 000000000000..598ca888c8c2
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/split-usr
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/eapi b/profiles/default/linux/x86/23.0/split-usr/prefix/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.16+/eapi b/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.16+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.16+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.16+/parent b/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.16+/parent
new file mode 100644
index 000000000000..665aafbea8db
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.16+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.32+/eapi b/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.32+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.32+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.32+/parent b/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.32+/parent
new file mode 100644
index 000000000000..7eed652658f8
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.32+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone/kernel-2.6.32+
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-3.2+/eapi b/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-3.2+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-3.2+/parent b/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-3.2+/parent
new file mode 100644
index 000000000000..b3da232ba558
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/parent b/profiles/default/linux/x86/23.0/split-usr/prefix/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/split-usr/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/x86/23.0/systemd/eapi b/profiles/default/linux/x86/23.0/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/systemd/parent b/profiles/default/linux/x86/23.0/systemd/parent
new file mode 100644
index 000000000000..ced72403bde9
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/systemd
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 63d4d20c0c66..2dee6382c145 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5535,7 +5535,6 @@ net-dns/nsd:munin - Install a plugin for net-analyzer/munin to graph statistical
 net-dns/nsd:nsec3 - Enable NSEC3 support
 net-dns/nsd:ratelimit - Enables ratelimiting, based on query name, type and source
 net-dns/nsd:root-server - Configure NSD as a root server
-net-dns/nsd:runtime-checks - Enable runtime checks, this could lead to a reduced service level
 net-dns/opendnssec:external-hsm - Enables support for storing DNSSEC keys through an arbitrary non-portage PKCS#11 interface, specified through an environment variable
 net-dns/opendnssec:opensc - Enables support for storing DNSSEC keys through a dev-libs/opensc PKCS#11 interface
 net-dns/opendnssec:signer - Enables signing capabilities for OpenDNSSEC
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 48dec20c7aa6..7eac097d0d64 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-xmlgraphics-commons/Manifest b/sec-keys/openpgp-keys-apache-xmlgraphics-commons/Manifest
new file mode 100644
index 000000000000..d5084e679ae4
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-xmlgraphics-commons/Manifest
@@ -0,0 +1,3 @@
+DIST openpgp-keys-apache-xmlgraphics-commons-20150603-KEYS.asc 27516 BLAKE2B b55b773ebd0b5a3033b6c5a7b704a0db03b856b0af910abb7aa71b1f883632e6811d8c4fc8e0525171c7cfb16f98d7dd7713657699946a601f19bf8b3dc9bd51 SHA512 b9917fc7a2ed3422c9b702133964f475a0ae988fccd06ec8f9afa2933f211582788f54453236c86ff3c4382969ad3157331482232a576f71512bc090853015d3
+EBUILD openpgp-keys-apache-xmlgraphics-commons-20150603.ebuild 575 BLAKE2B 93e164dfd5d96820d0e37df14f86a6e8d5efab2ac3e40e4e1ec40170460abb1670d22b37ec45300112ffb4ad70872555e2130e38bb83d8e07671eaab9966de6e SHA512 526812ca8571c5c896f668df1cf9beeae2dc310400425aae7ec598b4a33aed729f0705a9ee1ab7019cb3e0f5401f8b4c3dc3166e80a9e3742134d64ce187e3b8
+MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/sec-keys/openpgp-keys-apache-xmlgraphics-commons/metadata.xml b/sec-keys/openpgp-keys-apache-xmlgraphics-commons/metadata.xml
new file mode 100644
index 000000000000..6ef2d50cf07e
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-xmlgraphics-commons/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-apache-xmlgraphics-commons/openpgp-keys-apache-xmlgraphics-commons-20150603.ebuild b/sec-keys/openpgp-keys-apache-xmlgraphics-commons/openpgp-keys-apache-xmlgraphics-commons-20150603.ebuild
new file mode 100644
index 000000000000..9149769ac289
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-xmlgraphics-commons/openpgp-keys-apache-xmlgraphics-commons-20150603.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by xmlgraphics.apache.org/commons"
+HOMEPAGE="https://xmlgraphics.apache.org/commons/download.html"
+SRC_URI="https://downloads.apache.org/xmlgraphics/commons/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - xmlgraphics-commons.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index a0461a5ea035..b1c0d104910a 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index db4d62fbaec6..801481bcec79 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,6 +1,4 @@
 DIST binutils-config-5.4.1.tar.xz 7328 BLAKE2B 51f0ca625abfd964cc1b6c902017edc9790da1d33a44b3da64e3b2c68ed245fc1c0eb8b3fb999f6acb88e614f47e2f53e19b456b03c069bb61cd0f39e85d786d SHA512 af12644d591152f45d573bee0499b21c293b68a9b81626e9e1d46d5a7dc40e9a24642364bdb2bce52d61cbe3d2e045f4ab6e50a9827648a820bac885f20239cd
-DIST binutils-config-5.4.tar.xz 7332 BLAKE2B 1dd0fdebf028e9d95caa395948037d51ac1e627f370921b56fc99a6fe2e2100ddb202c8027ad1e67330306de8b4cbc6a03753105d401198e515b22fca94f760f SHA512 79411afcbec3a6cce960be1b06e4a6efdf55081992f6a92157737f7ef41fc61eaec0005078a4ce0cd78ad6af14583ab85f4f2b7b43808238088d521e1aa31af1
 EBUILD binutils-config-5.4.1.ebuild 1126 BLAKE2B 6da0f53323a2c0755b2f8d141987fe36e0111a5c0ad9521d0d44e732b99acd9e77fa02ed4acfaf7c8fc316766413a45dcbad35b8b3eda9cff7652e6ec8bffc99 SHA512 0a212654204abb57213262d805ee9dbc43a31a680d0fa2b0dd2d2a6c61d4a11c640b55182059c2a5e87d5b99a288859ff534921a865783c7d29d2b80b26b8400
-EBUILD binutils-config-5.4.ebuild 1101 BLAKE2B 407acd936b18ea59abe4eb231fa03683ca845c2654ff59ad419cd1fc171e45f27342346702b65e21a74df76e95e4ff95356a5f8ecda462f6c720eaf6d2010d09 SHA512 9c4821d7373d695690ac2bf239debf4aec1e8e80ad0200ab2310291cb6a2b69193132f2ca2aeb4c694295b9860dea444c759d59333c95844b3e79fdc1813ff68
 EBUILD binutils-config-9999.ebuild 1062 BLAKE2B 871d73773d58fb6daa77032d44a1cec845db2d17150182440a41f76c1cf8f9fbb28b66dc3d0455f0f5eff18ff4f9e27c91907d6e0c5a6258ef6a9211ee25d7d7 SHA512 5ee3b41b923e06e03b3e77cf329e83da6b22a4cce8a38375caf1aaf2965216a013df4de5ddc880235c1cebd3a03735e6bbdf9890763d32242c70e05a2d06bc28
 MISC metadata.xml 417 BLAKE2B f165e42734eb89e8c79fcd95bdbaef4ce0e80380867998cb649a669fea3ded3ce7326cca436cd6a5509b7a8948b3c7f01aea05b344f71ea5262517e67719448c SHA512 ed23d5be8b16265068b32816b4984e8cd07e62da7ab6a0adbcea1a826366f2844ad06b087c7b753d1b3a145b761608b83794133c0f84dfbe24b5703fb93344ac
diff --git a/sys-devel/binutils-config/binutils-config-5.4.ebuild b/sys-devel/binutils-config/binutils-config-5.4.ebuild
deleted file mode 100644
index 11e69fe4f773..000000000000
--- a/sys-devel/binutils-config/binutils-config-5.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit prefix
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/binutils-config.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Utility to change the binutils version being used"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Toolchain"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+native-symlinks"
-
-# We also RDEPEND on sys-apps/findutils which is in base @system
-RDEPEND="sys-apps/gentoo-functions"
-
-src_compile() {
-	emake PV="${PV}" USE_NATIVE_LINKS="$(usex native-symlinks)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PV="${PV}" install
-
-	use prefix && eprefixify "${ED}"/usr/bin/${PN}
-}
-
-pkg_postinst() {
-	# Re-register all targets. USE flags or new versions can change
-	# installed symlinks.
-	local x
-	for x in $(binutils-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
-		binutils-config ${x}
-	done
-}
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 10af6f53e1b9..578ea5262166 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,10 +1,6 @@
-DIST crossdev-20220709.tar.xz 29408 BLAKE2B dc96be5d86b343215564c2c15e91314c5ed88c765cec4f222b08a7e942ab5fb230915a0cdc3245719c0b12b4ce579066c6a88ae8e7ef4e44b80d8f0c5ddf7663 SHA512 f27929db8b4f7036408a0db18d46eb84312e1cef279336e13a07422ed3a154f3a21821d2d5ada66c0fca37bd70750413dab87b795c957a0a81cb9f27ebce2b90
-DIST crossdev-20220818.tar.xz 29452 BLAKE2B 2fdb9ef8e5ffc1eb7ca16b38a428726646b4283131e7de3cde2fd48f30c96091303d13b8f392ef6ffc0e09c6cf230f0ea6f031426f82cef3650933b1485742d2 SHA512 3c103ad84a5614c7783bb12ca8e5ce4b5d1bb25b89c429678600d62f9fd066a2a4f9617db61b6d583b7564181ea794bed577668e6fb5d7cfcfab25d9c5e94624
 DIST crossdev-20220909.tar.xz 29480 BLAKE2B 9c3ef9d9b8f13c81f9d2e21f8914158c04035a105ee1ac90ba30cb23a69744c9c6959bbcfd2e50d29144fc79937e5e585054d2eedfb2ced65a88467e509243be SHA512 86e8900a13095b7b12b00d739d28e2921f98818cd62daccfe6d750ce02113d0ef2d5e470b500bbfb80a9cf8f05b2a13882ac9963c3f1a4e1b7454bc1201df183
 DIST crossdev-20221227.tar.xz 29548 BLAKE2B c990ca8494db59e0dd5792fc0327d50424a816e2584eb1aff369185ce56c5cba00db783300d5eda709944df92da2679df792c6b090f9ebfb21dc65e63dccd779 SHA512 e5ae34234d6527f792ed30747f962afff9920cf85e449671651a9bf5726bce7b5cf4009d3be2e0965732857420de0937a5d7c78e61025e7f437d95a15cb56685
-EBUILD crossdev-20220709.ebuild 876 BLAKE2B e6ec33376fa0f63719097f68ee4537da9680a6d4808f94b843ebe8aa539d9151e0006f6bf5147725ab2127e58114ee4d1eada0371406eae9927418094f7cc58b SHA512 fd4c3a4f1a693e2387eeeefbabac290d88e9f3ed86f4efebe553c3051d83f9f7d21378b934a476ec6f5a87b6fa65bf4cf48f1c31c5684e02f50b2f2467e15c1c
-EBUILD crossdev-20220818.ebuild 883 BLAKE2B eac24bd668c81ef156ed0f51ed782249785a44c5fc4ab7f8960e13b7b4fba68c2d511be86a3c6ba661fbc8f067bc2d0ed684c4e5ba1531706d15c5fb1dc56492 SHA512 9e673283dfa83e0b8a988d2ed71c95bdd6102de15a27c3d3d1d6247a2ddb867f03ad64ad559c1056983b9fdd004853048ddc3453f899e7c3cd93b4b92e176937
 EBUILD crossdev-20220909.ebuild 883 BLAKE2B eac24bd668c81ef156ed0f51ed782249785a44c5fc4ab7f8960e13b7b4fba68c2d511be86a3c6ba661fbc8f067bc2d0ed684c4e5ba1531706d15c5fb1dc56492 SHA512 9e673283dfa83e0b8a988d2ed71c95bdd6102de15a27c3d3d1d6247a2ddb867f03ad64ad559c1056983b9fdd004853048ddc3453f899e7c3cd93b4b92e176937
-EBUILD crossdev-20221227.ebuild 891 BLAKE2B 5ce32299af815474f2bc7eab26cc40fc07fd555dad7e65d49564444c71f347b980911159182f55164ae32b92548148c94045006895490e838c08d252caac5f81 SHA512 9e41e0c5135a2848a5c0a34308ee1eaef779dace965a1bef6d230b906aeff36d03b04f9835e5074485bde3e38fadcb93f9ab0fd41c53556c182bf7e56cefbd02
-EBUILD crossdev-99999999.ebuild 891 BLAKE2B 5ce32299af815474f2bc7eab26cc40fc07fd555dad7e65d49564444c71f347b980911159182f55164ae32b92548148c94045006895490e838c08d252caac5f81 SHA512 9e41e0c5135a2848a5c0a34308ee1eaef779dace965a1bef6d230b906aeff36d03b04f9835e5074485bde3e38fadcb93f9ab0fd41c53556c182bf7e56cefbd02
+EBUILD crossdev-20221227-r1.ebuild 857 BLAKE2B 2be1472a076f1731cf4ba22c0730795c740892b17360f68ac53970c15d5f4ae0eb129f80f8a263f4a73c61546ad8edc4de9d316eb3fa2e397d37420511371cf1 SHA512 8974a9315193fe03ab3cea7aa7689eadb44ef02c2f694fe54463164dd69f88f6ea4127e1e03714783601af9e9e722102873bd15c4e57f7b8dbd5ae34f9754bab
+EBUILD crossdev-99999999.ebuild 857 BLAKE2B 2be1472a076f1731cf4ba22c0730795c740892b17360f68ac53970c15d5f4ae0eb129f80f8a263f4a73c61546ad8edc4de9d316eb3fa2e397d37420511371cf1 SHA512 8974a9315193fe03ab3cea7aa7689eadb44ef02c2f694fe54463164dd69f88f6ea4127e1e03714783601af9e9e722102873bd15c4e57f7b8dbd5ae34f9754bab
 MISC metadata.xml 491 BLAKE2B 92c9cbc3f52be1f863dfcadca6504f1bf0a22dd6a0fe958d0407be1a00acbcf4ea591e4bb84b9d654df87039b2ead8fd3557839078f70c001f1c101ae78e71c4 SHA512 bb7c32d398a5486565c5c317509881bcfbf9da17ce3fecb562c34c8a4e432dc96ff4f53f0784ee37eda4a868ad9d764d864cffc1f052ff449cf39ed9d5419d59
diff --git a/sys-devel/crossdev/crossdev-20220709.ebuild b/sys-devel/crossdev/crossdev-20220709.ebuild
deleted file mode 100644
index 7859b332e9ce..000000000000
--- a/sys-devel/crossdev/crossdev-20220709.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git"
-else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-"
-BDEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ ${PV} == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20220818.ebuild b/sys-devel/crossdev/crossdev-20220818.ebuild
deleted file mode 100644
index 62e271684dde..000000000000
--- a/sys-devel/crossdev/crossdev-20220818.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git"
-else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-"
-BDEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ ${PV} == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20221227.ebuild b/sys-devel/crossdev/crossdev-20221227-r1.ebuild
index 7e1f57b0dc19..a3a84da996ad 100644
--- a/sys-devel/crossdev/crossdev-20221227.ebuild
+++ b/sys-devel/crossdev/crossdev-20221227-r1.ebuild
@@ -20,7 +20,6 @@ SLOT="0"
 
 RDEPEND="
 	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
 	app-shells/bash
 	sys-apps/gentoo-functions
 "
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index 7e1f57b0dc19..a3a84da996ad 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -20,7 +20,6 @@ SLOT="0"
 
 RDEPEND="
 	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
 	app-shells/bash
 	sys-apps/gentoo-functions
 "
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 14c6a9f39ac2..f407c72212bb 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,10 +1,4 @@
-DIST gcc-config-2.4.tar.xz 17552 BLAKE2B 631645a5cc9f3e7ab0ff089960ee3d0b2ecea29aa96f839a03a86985db512bf0d182b67a7b1bb73b95808c04523f32d6b8c122cdfbe8dbf94e7d319a1e49a23c SHA512 852b4aefaccfae1d91c551e226ac28110fa23f9668075c190a5fb9129c86d2f3e4994e96b7a5e8a2801883c5a5b16d9fbf3e9066e6b6a423055fdefa490793c7
-DIST gcc-config-2.5.tar.xz 17664 BLAKE2B fa7133a54d3b49df20d3ae6036a65602c8a0d9e8668e2874a87d080add241a31322a3f4694bff8a5fe61957740603862539c0d9750e446d36beb2fb42ff0ba27 SHA512 20a8d62192faf54101352cfb6ca00503c9b2ab83aefecd94c4c887302a000d78334545a3424603a66a50e5f3ff07b67b16828813407893df5d94051776252b83
-DIST gcc-config-2.6.tar.xz 17772 BLAKE2B 5f06ac46c64fd241be9e7b95e277395623f015016c5abbe5e3275dce3fbf326d998a897a915b87387c878a1b57cdc847a6f95fa0b7ca00aa954c13d00a6e7d09 SHA512 27de726b266b2f58f28a4eab0a77141a8c0cfc9e939f4f0ee8dd382578a1cdececd30a4ae15bab858fec01a533c41248c9858f25d5d7314c36e8f2fcd57df429
 DIST gcc-config-2.8.tar.xz 17968 BLAKE2B aa34e681ef0c86bb846d89b816b46276f5c7c32974c785a9611a903a4fe165c997a34664abe17aa4d8720a96f194054e5d8c371a6c9270b1c235d7539094436c SHA512 5e91df44fb7782b9ad41ed06fbd53f74868c059f892c6c2b8195ebaa899905dd9f502562887f1a3765dd6b61698e956d01c6fa6f97a535cf16e26e70fcd902ba
-EBUILD gcc-config-2.4.ebuild 1248 BLAKE2B f37d9bc45e4b934ff696719aa437076c514f477b2eced5f1c2c46c71145c072be1be89aa8396c6495d2e8a914c60567d3ad2fe7a89bbdd2c3b2af70e440a6b87 SHA512 89646c3f10a395dd703bed306b64ba19920b82513aec1d88d450c839a1b34e39d839f3296d97a37e76d8f60612b9480a1133f8424813bf78ab9abcf55e392b5f
-EBUILD gcc-config-2.5-r1.ebuild 1671 BLAKE2B 752fb17d58bf02898942f8f0b902015811023a29f9cf472f2676ce92eeb5a940a871af224451283471032b2b245a6de599d940af72bc0acb64765e2ac6407613 SHA512 f8bb9f1c4612aa328d4707104b2ca553fd7114059c33157c7940c08f278ff2acab9cd06b87ecadc39b0475531acbbe33ea24e14946f5f5ce7a1cd59ee568a140
-EBUILD gcc-config-2.6.ebuild 1679 BLAKE2B 07b599672153259777e9d2cd67066378bb1bc5725487d84e71958b2b34cd059e8c04227a2b8ec52c732313356594c7c5bc05fd39979f9b08c3a038d90840e037 SHA512 99b1269318b5fbd6f44b48a9712871578c5758939cb88f0d808d89b55cbc20cec683e12fa39672a30575cba224e62fd4850bc981c058d74cbf37581e87399805
 EBUILD gcc-config-2.8.ebuild 1671 BLAKE2B e02d37cb1ce4b15e7bf315c3998db51e5b444a17c84a2b012315fcfba583d8ff3bdd622a83d97cb857069e59992013085a5e1e037b16e3498cdbfe1f1c99ca4c SHA512 efb4e4d37dcdfed5a92d00920fdd71ad13b7bef6784b2798981bb8b97a55cf572aefd02553d4c0ff6088df0cd68dfb5af2dd85a5b8be9f5d26316a3acb855a16
 EBUILD gcc-config-9999.ebuild 1679 BLAKE2B 07b599672153259777e9d2cd67066378bb1bc5725487d84e71958b2b34cd059e8c04227a2b8ec52c732313356594c7c5bc05fd39979f9b08c3a038d90840e037 SHA512 99b1269318b5fbd6f44b48a9712871578c5758939cb88f0d808d89b55cbc20cec683e12fa39672a30575cba224e62fd4850bc981c058d74cbf37581e87399805
 MISC metadata.xml 533 BLAKE2B 09d7ad23670553dc578f92d35dddd92b9421d7ef75e8920498bb16e451cce64a626a7479ece4c1ae1f8d7b67b5cd79c7033d0cf87cd48a788639b6f746fda5cc SHA512 ce12b8cbbe543ee3a1f51cd06c577ec5e99f48863445053858f36ae50ea68e1100da598dd44cef787de0cce8ad392350f95e7fd9071b70aa488a0d31cce7e22c
diff --git a/sys-devel/gcc-config/gcc-config-2.4.ebuild b/sys-devel/gcc-config/gcc-config-2.4.ebuild
deleted file mode 100644
index 1d9d5647b2f3..000000000000
--- a/sys-devel/gcc-config/gcc-config-2.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Utility to manage compilers"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+cc-wrappers +native-symlinks"
-
-RDEPEND=">=sys-apps/gentoo-functions-0.10"
-
-_emake() {
-	emake \
-		PV="${PVR}" \
-		SUBLIBDIR="$(get_libdir)" \
-		USE_CC_WRAPPERS="$(usex cc-wrappers)" \
-		USE_NATIVE_LINKS="$(usex native-symlinks)" \
-		TOOLCHAIN_PREFIX="${CHOST}-" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	# Do we have a valid multi ver setup ?
-	local x
-	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
-		gcc-config ${x}
-	done
-
-	# USE flag change can add or delete files in /usr/bin worth recaching
-	if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-}
diff --git a/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild b/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild
deleted file mode 100644
index d59534f90b07..000000000000
--- a/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Utility to manage compilers"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+cc-wrappers +native-symlinks"
-
-RDEPEND=">=sys-apps/gentoo-functions-0.10"
-
-_emake() {
-	emake \
-		PV="${PVR}" \
-		SUBLIBDIR="$(get_libdir)" \
-		USE_CC_WRAPPERS="$(usex cc-wrappers)" \
-		USE_NATIVE_LINKS="$(usex native-symlinks)" \
-		TOOLCHAIN_PREFIX="${CHOST}-" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	# Do we have a valid multi ver setup ?
-	local x
-	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
-		gcc-config ${x}
-	done
-
-	# USE flag change can add or delete files in /usr/bin worth recaching
-	if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	if ! has_version "sys-devel/gcc[gcj(-)]" && [[ -x "${EROOT}"/usr/bin/gcj ]] ; then
-		# Warn about obsolete /usr/bin/gcj for bug #804178
-		ewarn "Obsolete GCJ wrapper found: ${EROOT}/usr/bin/gcj!"
-		ewarn "Please delete this file unless you know it is needed (e.g. custom gcj install)."
-		ewarn "If you have no idea what this means, please delete the file:"
-		ewarn " rm ${EROOT}/usr/bin/gcj"
-	fi
-}
diff --git a/sys-devel/gcc-config/gcc-config-2.6.ebuild b/sys-devel/gcc-config/gcc-config-2.6.ebuild
deleted file mode 100644
index 7ff12f007e38..000000000000
--- a/sys-devel/gcc-config/gcc-config-2.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Utility to manage compilers"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+cc-wrappers +native-symlinks"
-
-RDEPEND=">=sys-apps/gentoo-functions-0.10"
-
-_emake() {
-	emake \
-		PV="${PVR}" \
-		SUBLIBDIR="$(get_libdir)" \
-		USE_CC_WRAPPERS="$(usex cc-wrappers)" \
-		USE_NATIVE_LINKS="$(usex native-symlinks)" \
-		TOOLCHAIN_PREFIX="${CHOST}-" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	# Do we have a valid multi ver setup ?
-	local x
-	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
-		gcc-config ${x}
-	done
-
-	# USE flag change can add or delete files in /usr/bin worth recaching
-	if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	if ! has_version "sys-devel/gcc[gcj(-)]" && [[ -x "${EROOT}"/usr/bin/gcj ]] ; then
-		# Warn about obsolete /usr/bin/gcj for bug #804178
-		ewarn "Obsolete GCJ wrapper found: ${EROOT}/usr/bin/gcj!"
-		ewarn "Please delete this file unless you know it is needed (e.g. custom gcj install)."
-		ewarn "If you have no idea what this means, please delete the file:"
-		ewarn " rm ${EROOT}/usr/bin/gcj"
-	fi
-}
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index bb2ff8a599ae..64fee076a1a2 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 6236c5012531..cb46826e5750 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -8,6 +8,6 @@ DIST xorg-server-21.1.6.tar.xz 4977496 BLAKE2B 8bcfa0a29f7b84b3ba9357d8ae9b1c7a5
 EBUILD xorg-server-21.1.4-r1.ebuild 4654 BLAKE2B b344bb3f720aa233a883ad8736c754b98ce16bc1f13711023dca505dd15b566850df27eb33f6e5c4668a3fa9a19163feef25407a8e3e5c1a8f188725574d9046 SHA512 aed5c0c76c411ad37151aef0209a2d7a50573839b68f299e33a219433e3d921b86d3e57f6e1b702ac5f064b581bd9c99ef08a4949df201b58e49c18509fbbbba
 EBUILD xorg-server-21.1.4.ebuild 4513 BLAKE2B 7a36143b235eeaec435bb21b989d464723ba062fa1d7b223b8f944cd60661662d38cac82973c7f2b1911cb4ba3294357a74677561fe599b636bb6a9896687409 SHA512 7fb72a177b8ef0f61ccb0ca677f118c065846577b9da21317b5343e19ec797b5e7cddf60f47eff50b4b03ee4507bc51c9f92545bd1e52357fe862e9265ced7f0
 EBUILD xorg-server-21.1.5.ebuild 4654 BLAKE2B b344bb3f720aa233a883ad8736c754b98ce16bc1f13711023dca505dd15b566850df27eb33f6e5c4668a3fa9a19163feef25407a8e3e5c1a8f188725574d9046 SHA512 aed5c0c76c411ad37151aef0209a2d7a50573839b68f299e33a219433e3d921b86d3e57f6e1b702ac5f064b581bd9c99ef08a4949df201b58e49c18509fbbbba
-EBUILD xorg-server-21.1.6.ebuild 4654 BLAKE2B b344bb3f720aa233a883ad8736c754b98ce16bc1f13711023dca505dd15b566850df27eb33f6e5c4668a3fa9a19163feef25407a8e3e5c1a8f188725574d9046 SHA512 aed5c0c76c411ad37151aef0209a2d7a50573839b68f299e33a219433e3d921b86d3e57f6e1b702ac5f064b581bd9c99ef08a4949df201b58e49c18509fbbbba
+EBUILD xorg-server-21.1.6.ebuild 4646 BLAKE2B cf73bcd0c069b6fb5c9999907e8e9fcf63a0115608f61009e856b2e73839fd8db4eb491506ad7d9a82656dcf7b8ab5348547eca397c96342aa1a1c4b0f4c4fc5 SHA512 d7e55274629256573017d5421339911f4aff1e56b4dde3f5e670bf404ae6e99c6ac6aff612f97488f88149e6b9fd40e0eb0e9e7dce7c25017a0cd9f0e68d4213
 EBUILD xorg-server-9999.ebuild 4516 BLAKE2B 232c7211a805dfca04da95c0c17e71847a57bbb22351e8eecd5d5be51b88653ab7ab67874e66022cf70bfdf382e7e3284de54a2d843763468540453fc46e1592 SHA512 ffa779b6a8fc0127422542863eb4ca25876c352662215bd4ec1a29dccb354514bdf7e043a66b5c5d1aa634f386b75d3528b0c39ace7d4bc745a1593477d205ce
 MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90
diff --git a/x11-base/xorg-server/xorg-server-21.1.6.ebuild b/x11-base/xorg-server/xorg-server-21.1.6.ebuild
index 85f83743b7ff..552f91189bcb 100644
--- a/x11-base/xorg-server/xorg-server-21.1.6.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.6.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="xephyr xnest xorg xvfb"
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 3e3be3cafdd2..4f7d5c4752b4 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -5,6 +5,6 @@ DIST xwayland-22.1.6.tar.xz 1273532 BLAKE2B aa0604e425c8e5648966f58d8baa56163f7f
 DIST xwayland-22.1.7.tar.xz 1273476 BLAKE2B 9e128ff85690c6fb35eb196eefd49b1cf24aed290fd74cdb6e2fb8ad72d61b8dd9dccf83bdafc9a8e1ba13dc61135a7756dbae5ff40490d2076516d72818dbb1 SHA512 dc4187d4e9e1bbf5f431a4a71da01b773be3a8870c3f82da599739d9f72756ac69c1fb8cc3b6c96c88da3c1dd40ce42429a3a003c08f90fc337ebaf6200de649
 EBUILD xwayland-22.1.5.ebuild 2148 BLAKE2B 7be8706e2e0d4694506c7de67c914f75be631f17964feab9b05bd72d7d4e1a4e583f04ab753c0e5d732ef435dce5a0a28d3758304bb820bc9e184a9ef6948401 SHA512 731fdcb1bcba4612381c1b97ae2d7e7fea20b86530ea2a8820ba755f830093377f76d1c6f353df1468e45a02554d22afb3ad76c06633296961165daffa3b1839
 EBUILD xwayland-22.1.6.ebuild 2154 BLAKE2B e76ecab4126e3bd7a4f37633ab56773759de72653e2d04ed8a58c278720770d38efac5dba2ae53acbbf560d3b3494de34d0dc4a32370bde9daa03fce940645ab SHA512 3216ab44000ff2bda753586a506251a3ec7ba3320497d347a3888f7638ba93622abec5ad03b7951a88915bc7ecc53afd67eef8c6d9192d10c35a1c4d24454924
-EBUILD xwayland-22.1.7.ebuild 2154 BLAKE2B e76ecab4126e3bd7a4f37633ab56773759de72653e2d04ed8a58c278720770d38efac5dba2ae53acbbf560d3b3494de34d0dc4a32370bde9daa03fce940645ab SHA512 3216ab44000ff2bda753586a506251a3ec7ba3320497d347a3888f7638ba93622abec5ad03b7951a88915bc7ecc53afd67eef8c6d9192d10c35a1c4d24454924
+EBUILD xwayland-22.1.7.ebuild 2148 BLAKE2B 7be8706e2e0d4694506c7de67c914f75be631f17964feab9b05bd72d7d4e1a4e583f04ab753c0e5d732ef435dce5a0a28d3758304bb820bc9e184a9ef6948401 SHA512 731fdcb1bcba4612381c1b97ae2d7e7fea20b86530ea2a8820ba755f830093377f76d1c6f353df1468e45a02554d22afb3ad76c06633296961165daffa3b1839
 EBUILD xwayland-9999.ebuild 2221 BLAKE2B 79ebcf371891bcf3000095f61b53459279b78e1461e6ce361532452f6d20a5f5a204d1c366fe5cdd36093d40237932866d08a62edfca2aa7b82960285d1360f2 SHA512 67fad119e1bef87751bdb1ebff8d349e122875a9940bd2557d93ce2db99209d663e9f3c74486775d6cb9258d692642bc9472344e5bf4063d34ceb8ea6fe9456a
 MISC metadata.xml 543 BLAKE2B 6d9eaf03b02d3db1a546ca6443bc0e4964be085031c18ba0b5e58e615ef48090f181894fc9aec4abe358a8b59131423135b3bb25f0fe3a3cbb628e8d0f52c273 SHA512 075a7e2f5b39b537472c2ce242d9c7dde98be8230c6b48ec4a4115bd740011d1792a9d8188b44326276c91b7ddb56f01d1e548199786885b0f766854eab047b6
diff --git a/x11-base/xwayland/xwayland-22.1.7.ebuild b/x11-base/xwayland/xwayland-22.1.7.ebuild
index 384312c2aa5c..afcd2774aad0 100644
--- a/x11-base/xwayland/xwayland-22.1.7.ebuild
+++ b/x11-base/xwayland/xwayland-22.1.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standalone X server running under Wayland"
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 19af4c7a5dde..0e566722f2a4 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/elementary-xfce-icon-theme/Manifest b/x11-themes/elementary-xfce-icon-theme/Manifest
index 19e3c46f5c5b..dc9bfb4e3b61 100644
--- a/x11-themes/elementary-xfce-icon-theme/Manifest
+++ b/x11-themes/elementary-xfce-icon-theme/Manifest
@@ -1,7 +1,9 @@
 DIST elementary-xfce-0.15.1.tar.gz 6198394 BLAKE2B 18638aa2c55a01a48fc342a836c9271aeb09524ee1032bc8237fc864e92fa09f8784439ab793f474311465ef40710ac7665217496ce98444ae146c7c526d43da SHA512 e28524c0a1f3b2b35a43428ab4de58e0e7635b5ca4e57f88d44de356965dd978d34aeb514440d7413dd8cdaf1b869bd5024e63cb3bd668fe9b47b52872de9445
 DIST elementary-xfce-0.15.2.tar.gz 6215682 BLAKE2B 917f9b8f555a02d01807695b67857e4f31b3a1d6229727f992c299f119641c1ec2c62098473f7617a77cd25ba8e385cbb2209d2bf73554cb6934faf610a18b00 SHA512 c7d62dc38295ed9fa66e9e21f06d18bdd095aaa6f5f012065e70517117d8daa05c3a25942185fdfcd5a2b79e510c55983a09dee79568e95e8f22e6199ec28ef0
 DIST elementary-xfce-0.16.tar.gz 6983116 BLAKE2B e33f244d6a19ba447149981e57cc5a41a98f17039ba0ae546945b75dabefde3bc15288fb8d09b00c500de8cf11ed37160b0b35d7d653d9a8eb29ed6117edb723 SHA512 d1f1338e3b6d2835741835be04db03154bef8fc53dd365855f646c3668f108f1a6d2ea7c7e8b07152f79cfcf29dc9959b2363417ca19b425da908c913fdab960
+DIST elementary-xfce-0.17.tar.gz 6964314 BLAKE2B 3dbeb664a0ad6fbcca916df7103057e63ff988456471070f62e020188d3f7dd900ded634c5e13b9b80780c2c5514a7155c533df3537c791da54f367a13834cc3 SHA512 3e577f8f800b77f2efaa17877d0031790a700b4d0433e6ab5d6ce2f859941160291a32a0a042e5ad99e81e631042db1abedc31c2f657ee025df1807fbb456720
 EBUILD elementary-xfce-icon-theme-0.15.1.ebuild 902 BLAKE2B 67f7b19fd8730dc4888203ac32e849a46b8b1376ee4d0ae6cf351744dea88b8f14574ef4eb4415fd6fd46e0daa7e2d782bfd92f79f2eb303603d0bd7e4423786 SHA512 74d5f64831e2f466f1c4dd4a8fa91b6d512aa4a67b33539ef9984f7cf81793bc1c000d7c969434860efd467afae9f04a8ab59a4d70a4e18372c189d3aee1a3b2
 EBUILD elementary-xfce-icon-theme-0.15.2.ebuild 1033 BLAKE2B 9593739208a4ac37755ca29f1994e0cf1dd3a1593c62325967d0ce671359524bb239c4277615a10aa5843892c3291ec490573fdd2107f998839ef2eabcc28a19 SHA512 86e46517f82b0a3475b1845cf86b2ca1c9da39bc2f07dfec63f1588a9c4a75124e8d7918af28a3dddbec80e0ca0621374382904c0fd1e1591f0e139971b99e63
 EBUILD elementary-xfce-icon-theme-0.16.ebuild 943 BLAKE2B 449dfe0ba71cdc86984ba590d04dd71eda113a25aa902a6843f759b82de1e6ba3bc024b2843b881273a81ba11c7153672b671254e734ec89c4b1a579fa9a17b0 SHA512 dad65f64df8e0cbc857ca5a7e68d06896790b7371abdf472564e6310b933a6a75e5b563f511e00017a5b58a25be01e52e45084b9287e3518c20b54ca1a91e6af
+EBUILD elementary-xfce-icon-theme-0.17.ebuild 943 BLAKE2B 449dfe0ba71cdc86984ba590d04dd71eda113a25aa902a6843f759b82de1e6ba3bc024b2843b881273a81ba11c7153672b671254e734ec89c4b1a579fa9a17b0 SHA512 dad65f64df8e0cbc857ca5a7e68d06896790b7371abdf472564e6310b933a6a75e5b563f511e00017a5b58a25be01e52e45084b9287e3518c20b54ca1a91e6af
 MISC metadata.xml 347 BLAKE2B 8ad2fd28a1f8e023820a4fa95bf26c2df1f811ba96029e993cb99ee212d22b244c66156cf851b708494dde38825d91d77ce67a023562b68bb13921e1ff37da86 SHA512 e8c5b5fc19e3cc8b5fe5b6facbec01497a32145cbd93bbf5b8e402f3afd0e46d15573be12e8fdc3eef0172484166e87652ffe097a8c05db45f891d5b34d721ab
diff --git a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.17.ebuild b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.17.ebuild
new file mode 100644
index 000000000000..036ea4f33508
--- /dev/null
+++ b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.17.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg toolchain-funcs
+
+MY_P="${PN%-icon-theme}-${PV}"
+DESCRIPTION="Elementary icons forked from upstream, extended and maintained for Xfce"
+HOMEPAGE="https://github.com/shimmerproject/elementary-xfce"
+SRC_URI="https://github.com/shimmerproject/elementary-xfce/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="public-domain GPL-1 GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+BDEPEND="
+	media-gfx/optipng
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3"
+
+src_prepare() {
+	sed -i -e 's:-Werror -O0 -pipe:${CFLAGS} ${CPPFLAGS} ${LDFLAGS}:' \
+		svgtopng/Makefile || die
+	default
+}
+
+src_configure() {
+	# custom script
+	./configure --prefix="${EPREFIX}/usr" || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+	# delete dangling doc links
+	find -L "${D}" -type l -delete || die
+}