gentoo auto-resync : 26:11:2022 - 19:15:12

229 files changed, 2202 insertions, 1268 deletions

diff --git a/Manifest b/Manifest
index bc885aa0e796..954d3a515c31 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29624 BLAKE2B 49893bf2358026e76ee82a05bc423845536c43093aeeb4a6253e22d7dca808cc10362e3766d695d10874fb5f2286f5b4829d9bd4abb8f378bdfd010aee841f9c SHA512 8b8f613a414b37eab62560f3d01ca20c25a6c6748b74b11bbdeca914955ff90953d54f070efda14a93ac28c2b344e1a51f0949224b098bbd9572143eaecfbe11
-TIMESTAMP 2022-11-26T12:39:52Z
+MANIFEST Manifest.files.gz 29621 BLAKE2B b9e382dc6a9fb42677b55e869c650b786040c820fedeecafb23ce29fdc5a2f5879fbf2a8f8f3712cc55c4b4f9c74073b69e9c2d3ba16e6beb67ba3c372a799ae SHA512 5360cb2fe00f480066e2308f3dccc331d397f1110183128b5cf4dce5634629f9045c01c9c15c82adb8030886561e2dec01bebda232827021ba4d256677098384
+TIMESTAMP 2022-11-26T18:39:51Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOCCRhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOCXXdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDS2g//XvL09URMUPxGB0NfdUf5OPc4Bo6QFpdvfJT5o1gXhL7olsAmzEjGgHau
-ENj2mB8GL7HnlEdZQ8HALkWaXLsvB80Z39GBA9sW1WujelNOnRKBVa/zM3h2Ek9R
-9khzLTaV0MnkZ+LMaySgEb9XfpNdXItHxm3XPWmXQo3yydOZxLNfWga31VtFqpms
-58zS8GrxkCpRbm0lGxoirLlZPh3EBEj/siqlNQZ0DRSPOZ0NtpSjnj6sk2/mHCyd
-0wDIJA0a2uLGFb5jrMIdagCIAHp8kOtaLr4kyrSkJ1VA0+r2TlUyLdLi6ddOzUrb
-tvcAU1Fq44xcngg6v5a8mxkkRUwqRbjZqcGM8dcyUMrNRhp0AUH2D1r88mcSRnpT
-mP7u0+n8HHTCj6PgqagY03PVlV42i96F6n+L3hkumMVzLlEWtSgq2AFlEd6EsRo8
-OaaNWyJSv9Mv/moqygCLeL/ljmRWuYY3jYGnZdcdjZwdoUxeyXlyYZccRBbCw9Mv
-UeXPqauPwfyJKnBF23GDc8RKB6bmyEfFuDTvkLb0xJdttUvMiqlFbWRiT6kn7PUw
-3Sv2FsVEqDZI/gV0rHtQmvehRBVd0dcqBYGGQOPA96OHWMZYw2ldE350c0yf3zeW
-r0vawj7vAsreTKbZ4kiugadH2CwyOyNUjbGoEel45xg2HDDuedk=
-=ij0d
+klD2qA/+LkRYkMsTvrQRbVORiQ4ZBAph/7n1PGT+7Cd3AShxiXwvGOOuF4FTgj4O
+WYyLZmGOkRAdF4MDCNwLDrmNauVO6KVjAbvwXQ5Z4pgPvGUJ3d0xpFJANrrnUG9q
+xlhOE1MIbxDUciGWwi3UqRv050uz7nbax5mVoum1cjaix3eVEcy28EsdWMF1JNVO
+cWlRiQsGQwK1nVByKck5Yd5qmx32G80Dri2t53K2JC3bZt0MPvWPqXGfvmSBLfpF
+CGpMGbOldcdvXkWfppRa8HAASjfHKvajzMTRth/NiEzWRh0YJR+V1lnc2YOKD+eL
+i1BschTejyrrpOcZ52I5495OSE5Uu4+/ueBcK5nz1hDMeh1jI9PqZXA8jm8FikOE
+NAlVBHcpyaJAkQo92Mcn5pvsfwVQid2IE977R2EfI0vmfLZ+f5Ry4wpbiKaMGCXv
+e3/3EpU21L138P6eNavK70JU6hrfHRbiv7T2kyGHPOLhAoJhMpFLd0gMhtNzqwAS
+vTkxI2E5rToTVP33ydS0YHRr7fkXPVmeEN5dyY/feO0//iW4eUgAfhq1BERG6xNK
+zjZIAJTyEkIuwqW8NkCzU/2dvCt/ro2C/4ibp2e7ojCRTA4sLkuXFQJXkuAFXruO
+jpGTTepJD6wSQTG5K7NeW5MamsM/Irg8FRkSqD/EkHR8oh0hmVE=
+=ReMf
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 14e91895c536..afdf707bbfd6 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 27f36e2bb672..6da14c3f6866 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index ffa82352a66d..96480b6f1236 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -6,6 +6,6 @@ DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 44acd51a2c18ae66878d64922947f2f24f0ddf
 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
 EBUILD apache-tools-2.4.53-r1.ebuild 2423 BLAKE2B 5d4e00341e2809571e9ee0e76f09641487a68a82b93cf7b8dc23af359f62068207d7dbaf0748245c03869d989b0f9782e6a56c0c23a6b7e564f6785c365af6d1 SHA512 6d9787f2df850f1264c64fd8f4df19f8b85b83f9282e80d472296d9354b281bf5ab13e0449a0b562c0c333074a2e1714a8f53e8e47f30b5d0b6ce831bad6b41e
 EBUILD apache-tools-2.4.54-r1.ebuild 2519 BLAKE2B 9891e61ffc376012f1bb63f71699e8943899ac94d176ece8ef948485e282e0212121e75edc5625b3b515f55b8d604061d3a21469de99d7ced6cc1d4820ab7b41 SHA512 9e30cc37ffcd1df4c15838b4c7e81631bbffafbafe49243e63306e9fd89d503925ee646f25574230aba4f3e85d2b1b12a30f0fda4a42c28aa6eacab7c2695c11
-EBUILD apache-tools-2.4.54-r2.ebuild 2588 BLAKE2B 56b3d55307a6dca4bc4992a3568fc480b0d317126682fe5ebfc39d431e34ccb427cb21e7d73db459e9d9f039676a24c78d2c0423037878714bd50d2152440ed5 SHA512 d89bc9d05aec5ddb07bc813c592f41f933e21069b2a437b563d4365c69ba087d112a1fb22a60ac1cbf6bfa81aedda1c37dabc88fc53acc215e03f442e671fbb1
+EBUILD apache-tools-2.4.54-r2.ebuild 2587 BLAKE2B 1cb204adadf68528a9e53fbdac12c093af0a1ed9abf47b6f5b87e80b4233ca7493f86096239a337235afb5415fd6c58f31ef7c4aa2efcd9937a8a2acf07e0ce5 SHA512 baaf161807fc75fd1fad8beb9f12cfa63b54e7eb588d28a29689c2541d20c548b3e7fa1a3c7b38b11f25b7ddee9076ebace5d71e8f0fc6b9d6164e4da40c2752
 EBUILD apache-tools-2.4.54.ebuild 2423 BLAKE2B 5d4e00341e2809571e9ee0e76f09641487a68a82b93cf7b8dc23af359f62068207d7dbaf0748245c03869d989b0f9782e6a56c0c23a6b7e564f6785c365af6d1 SHA512 6d9787f2df850f1264c64fd8f4df19f8b85b83f9282e80d472296d9354b281bf5ab13e0449a0b562c0c333074a2e1714a8f53e8e47f30b5d0b6ce831bad6b41e
 MISC metadata.xml 557 BLAKE2B 2453755857cf2e46c2df17a307b095ad2b7edaa4e87363964a0bb5e3dedc9284e09c41256f24037f8d680fd3b87e906f18ffd0f8358025fb0828ea0871229731 SHA512 d7f046261c3bb8529bbfaa7e8e47a304341c397dea4d0c276696a5c32b2fa12f0af0f73ed7ad435c3548a2a167230f3abece216e3cff7440fe0cf1498b7c8819
diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
index 0f11de8e9b73..b10f8a8bbb67 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"
 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 1bdcda2f26d1..963c0661944f 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index e96755939a8a..30cca9670e22 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,3 +1,3 @@
 DIST mousepad-0.5.10.tar.bz2 959696 BLAKE2B bd21145f23f1e92d67489a3ffcdca0afd977aa639706dece5aefd2f5417d2b2122accc1a5c727ec13a4c2f311ec479612953006d78b5509e836f360566d0d320 SHA512 144e72abce8e5fb66a345fb59efe48f136dd9cf9cdcd72496dcee05b08781bdbba036f4ab5af04dbccd38dc52a8e8dd67b5b7434867881a1114de692a012b076
-EBUILD mousepad-0.5.10.ebuild 947 BLAKE2B c793877ea4e4e4c328e8634ff4ea536c79380e6885a8379650a627ea6a89cb06361283d3e550889547f5ebc74e306e4008601bd861c7bf724ccb5bf5eb952241 SHA512 f5888cf8f1291f328e004309ff10a94f9ebad522a56bb4aded0b260ca3ce6f1a473e7734a01b9824c3f5588f87154aed529cfd2269810dfb2fd3f843b2b8974e
+EBUILD mousepad-0.5.10.ebuild 990 BLAKE2B 9b497dfeb0898cb8e3b5f6d181fad7dfbf157bd0db010e62d4e5f9c2fccaa718ba03be8a49d920014a65eb9343c4813b42333a9945591ac2c344c632b8bb9c72 SHA512 ba1adda317e4ff03e37b633f142ba97855d2eca542bde1b100fa7d82b61c96ad94c8d9d90b6fb0154c5b0b6b6285d65d9180eed48da5f293bf2fc4e42ce2b819
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/app-editors/mousepad/mousepad-0.5.10.ebuild b/app-editors/mousepad/mousepad-0.5.10.ebuild
index 40c71b7cd8c1..1dfbf301d5f2 100644
--- a/app-editors/mousepad/mousepad-0.5.10.ebuild
+++ b/app-editors/mousepad/mousepad-0.5.10.ebuild
@@ -6,7 +6,10 @@ EAPI=8
 inherit gnome2-utils xdg-utils
 
 DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
-HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
+HOMEPAGE="
+	https://docs.xfce.org/apps/mousepad/start
+	https://gitlab.xfce.org/apps/mousepad/
+"
 SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 9bd2ff5e4647..f01ae943baf6 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/eldev/Manifest b/app-emacs/eldev/Manifest
index c4da8eaed1c4..e66848b809c5 100644
--- a/app-emacs/eldev/Manifest
+++ b/app-emacs/eldev/Manifest
@@ -1,8 +1,8 @@
 AUX 50eldev-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST eldev-1.1.3.tar.gz 215481 BLAKE2B 9eed051f29be1eda9e7bbb2f55fec69d217d52fda592b206afe39c7f64584140a8e3df75f0963f1f6ba95b555961218663bede39b32f86508f0ade95e627515b SHA512 5d91d3067d82287543d4ec55440874900c3cd52359415da961641af96984f7cee978ded1dc77752d6df55440d48c951c010070657177180aee623647c9dd76b4
 DIST eldev-1.2.1.tar.gz 238318 BLAKE2B 18c75aab3b06254ab1c8fe87c11104977066bc5fddfcd5e11c413e9d2df7458cef55da9349bf1bc68cb126c02addbc7ee2f071c698f8bc1ba1195dbe694a99ba SHA512 88a3750eccd10eccedb2cff1b807d65d8026c07cc1255ba9d562c1ddc662c2c14641cd4053d82574b2007ca1ce1470bd1f2ebc5bcd99207ef7e0749eb6b6f505
 DIST eldev-1.2.2.tar.gz 238729 BLAKE2B d1d896033a98ed12c64a90fba828f28794c4196e62007004e14648db3f5bf19a253d50977ba335457793c7e2176857160e684f395429ce4f71ac0a794e10b776 SHA512 b0cdad8b09d019adb9f6c6347e3a3194dc7486e14046ee8d100addbb0e46db23b996237d4008e823a6713c0f55dc7bcb3d6044e3723b95e754e0e121d42beef2
-EBUILD eldev-1.1.3.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
+DIST eldev-1.3.tar.gz 258781 BLAKE2B cb5b48622d77a3f79dfad7b9acb08705edaf6b9bc9c5086bd8afad515d0cf0f25a504f2c39a0bfa7a7f55d2855d11d993c02a46fbdf57d4f47e7c0530412f057 SHA512 ed7edbc6c2601cd1db669545d9103c632c46d498eb3839fc87003c1bdc2bbf6eac76f996bb3290e5115b8f474afc0d028db740f2c6bcd1b67e0f6174d321fbcd
 EBUILD eldev-1.2.1.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
 EBUILD eldev-1.2.2.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
+EBUILD eldev-1.3.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
 MISC metadata.xml 982 BLAKE2B db2324ced8f4bc4ba579130677175a9de7a8dc7b8d937cd902edd69a20bc897bf4ee034acb6a9400b88de82c58c2b144e62ec4ac7b75d8dc63cdf56670cacc9e SHA512 3e4d2d7ea4fbada45b4d933d7711266bcd9ffd217ee3c3e3351e9f66145785dc11449b4f09f5ffa4853d2b475db45e501848d259f80fb5aa26429acadcb6da7d
diff --git a/app-emacs/eldev/eldev-1.1.3.ebuild b/app-emacs/eldev/eldev-1.3.ebuild
index 3f35959f7270..3f35959f7270 100644
--- a/app-emacs/eldev/eldev-1.1.3.ebuild
+++ b/app-emacs/eldev/eldev-1.3.ebuild
diff --git a/app-emacs/paredit/Manifest b/app-emacs/paredit/Manifest
index ba4b61ad5a96..639220eb7a32 100644
--- a/app-emacs/paredit/Manifest
+++ b/app-emacs/paredit/Manifest
@@ -1,5 +1,7 @@
 AUX 50paredit-gentoo.el 503 BLAKE2B f08ba9965af5d555de5539b017eb230c9e5eb296f0ea9f98fb2f46a4a7c665e5757cc7b135df7282118f16e6b96a926e8e8952b926917a7cb5e0266d4d751a93 SHA512 4635fa54babe7df170356f4d74d9419bfbe185301a37110d5a12620b1c6ab4654b66c2062814cacf64e480c5079e3da82354ff78db6e600e4dac68e0ba13451c
 DIST paredit-23.html.xz 1920 BLAKE2B 029c09848bb162c135c882ca17e6d5da9c3c17ba3937a809dcd03edb4b1841a0069a72dbd6676003cdf1a9de60a1f88eefa1de050210a37b52a005d28892ab14 SHA512 0ef584787b6094f1d0720aeb4d3a8c106605be62ffaa240d27a190ed9a6dd83d6d1ce68c2d184e84539a0e0658dcbed068335b69f4b1905ae9bf3d9968d5fb9b
 DIST paredit-24.el.xz 24332 BLAKE2B 5243810cfcc40ebfd62ce3f833afa214defe9b91affbeb142ddad308e1fcff3f54a0ed19029a5ebd31f374868abc34f160d2efac65a609e783483ba2c92194d2 SHA512 76d9d2694473aeaab573964d79418fba20bfecef7f3771682f769ef05fb9385f9ef6dda1a5c7edec5d0a6f919d2eca5e75d595bd8cd5220c5179bfcac5f20f94
+DIST paredit-25.tar.xz 33552 BLAKE2B 7fd36e796c754a6bca28d3bbdf59c37bba326870a6ba94380b4c6130a5f0be103ef8ced0071059faa785fbad7cdcfecd0eb491a2b07200cc6e3208b61b0a2af2 SHA512 46ae5eee7007d7ddc2c03955f521dac950b88ee3274faf071983380d83b30b553da7d21fbe791a2c760f0f56b7fd177714085c18a8dbc5c50bc0a240bf7e77aa
 EBUILD paredit-24.ebuild 731 BLAKE2B 4449d28bb8f69ff9102cc0ba7b9c6f22685cd7f644c6e8c3c7af26dc9fec4f55f39a7f12934b3d17de90e1fb25fcc5f9102f40f1b79ed3a0f52bb737840a3a9b SHA512 8b91cfffda15bca887e66ce9d8554dad2940701b7c0250e6ded031f9c6df4b0db1aa957219fd054eec54de8f643dacb52f0d7ea9e19aa4bb530b32fc8666cf7f
+EBUILD paredit-25.ebuild 560 BLAKE2B ace494e9dd4b49202fd9ba79c96f88ef14f8bf3a97f9819645832baef5c49c78a286fbcf307df6def6b4ca57c62cb2e9075ecc64b4f56f846d77911ac1e074d8 SHA512 88902156a5ac75b078d9a449edef5fc396f8636b57a248f9d99ac4a55780b73063ed110eed922b089347e61ed7b31559fcad7f7bb8571d4a8d9c8f41688478ac
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/paredit/paredit-25.ebuild b/app-emacs/paredit/paredit-25.ebuild
new file mode 100644
index 000000000000..8510221c5950
--- /dev/null
+++ b/app-emacs/paredit/paredit-25.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Minor mode for performing structured editing of S-expressions"
+HOMEPAGE="https://paredit.org https://www.emacswiki.org/emacs/ParEdit"
+SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DOCS=( ${PN}.html )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -l ${PN}.el -l test.el || die 'tests failed'
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6325a69daf5e..28ad85ee0ddd 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/uudeview/Manifest b/app-text/uudeview/Manifest
index 7a2d8a7bb0f1..d112cea405fc 100644
--- a/app-text/uudeview/Manifest
+++ b/app-text/uudeview/Manifest
@@ -2,9 +2,13 @@ AUX uudeview-0.5.20-CVE-2004-2265.patch 1788 BLAKE2B 6ee4cc768f3bab3cb4116c465d1
 AUX uudeview-0.5.20-CVE-2008-2266.patch 4595 BLAKE2B dd2ba71e43941812472729575f1481be9d93641f1868952385f7d5f69d6c63991b6856becc967d92c1ced93f0b5a68349af43b011de4ab92adacb93232b226c4 SHA512 fe6ffaf4d55f8a367cf8661ee4599f1224b2bdbf1d3659558c024e7c0d9a6ad043d7eb9631f28e4762b39a5b5e2a417b66be9e98efc7e5caeb9a286e239e486e
 AUX uudeview-0.5.20-bugfixes.patch 3575 BLAKE2B 8778f0f08fa8d8c5faabf2721c195505a53369f30d93c494080025e491121a75135f321fe5c0c117e5bfd538a7cb2d82fc64cb5584822dc9f353cd31b168bdf0 SHA512 c5e4126e9457cb94d6f014ba20e2497969a50b84d917bd31529a2a75ae5b1e9990ec946e8f8de7a83ced71e32aea7d62210416d94b765dc860902825ca6b34a3
 AUX uudeview-0.5.20-fix-append_signature.patch 893 BLAKE2B deccd364dffe6be50b5985c603a55407fa0ae358fcaa31133607d276d04770eb5e43ed175d8d169f3afabd9dc7a27c55a0273dc946f0e85be48f66922ec1ce91 SHA512 6c84e1276b1bb1f411bb9b1561d32f49312c6969721c4016761d3a2cef388d46b6288e5e5000d2f54a5529ba1bf16d5427ef73f531be5d53d8abcc2300792482
+AUX uudeview-0.5.20-fix-function-definitions-clang16.patch 3242 BLAKE2B 250af757d13ca87cf547e7761a03649c69f8d53e9a0f8d336370e9b5c6ae1af2ac085c868cdbcd8f926c6c68101af52a378ac061c7223593ffb9781c47c7b882 SHA512 5a87898683f1a0e8bb70855533d63578b74e975c6794e19b253439eb540c9dfb1918cd67253b0269116799118e22d0e14c8377728cc6f75bfc465dda27fdf67d
+AUX uudeview-0.5.20-format-string-warning-inews.patch 384 BLAKE2B ff953f6401428c9055f21db08a813d64a275a42fd1ca4065f333826f22bd75b7310f1cc462f52f804acb42386ca91fe1dac22d4e5df8f10d9dfd787da787dfa8 SHA512 082c2892f4f6c6a16e44ab4754e71168346e32f3ee103177de0a7361f36b8ea4f0f612284ea47241beae63ab85c6734990c774e8576ad7cba678929826fde1d5
 AUX uudeview-0.5.20-makefile.patch 822 BLAKE2B b7729d04f9b881924205efce8dbb398b12e04ed95aa585f2e19fc79340e36772d8c8eb2c9fa23d2d69fedd44c743d85234578edd406b910f6f6ec70457f220a2 SHA512 69efb3af67aa9a47a4d4155b1c346bda5bcfcec26000e82b170d854dbc29e72ce6a8b21f171a72761f8ea2cc2c6fb65e74700a6134c9cbe107b596b45762a34c
 AUX uudeview-0.5.20-man.patch 3246 BLAKE2B 390d89a13080798b1ef0f902d92c82df59c10c6bb5b34eb8655ceadade0e31b0e81c100fc3e8908edf6c482c51c2560b90aaff8156b7ca805908036aa8342b77 SHA512 a940d6663563e7a91b35f5350e05b6cb7939f06d7db8767a8a5483dc82477c796a351cc03be9de49bd55513ca0b2e3203cd82c4b834caa54da9c8aae5750136b
 AUX uudeview-0.5.20-rename.patch 1736 BLAKE2B 820e32f9d2fd248ee2748e3f6173994b02074720814ec8adc6a896b72defc29ce24a356626c7bab414c516555547fe04cbaf304a52c9f141b80a836593c8638f SHA512 afb5b72bca70eb7c156584df1b44fa3cbb6cf07da97a79ff6330acb52ff102584b7a382ce779f2f695c9384d017984cabc670d31b243c0e5d916df19c6846439
+AUX uudeview-0.5.20-string_format_issue.patch 907 BLAKE2B a99e9341219e8581cf32ef8423a351ed88217ed8bf3899d6845bdae98d117dadeaa46a72bd2158dd0c73e49c3f946c28d305d534ea63e233da29248432ef860a SHA512 9e8936308e216fef39f5c44ae7a6eab6dec015ee6b6672a0c3a197b126ea9e5d94a7c99ef15b830b852e56c644aa84faba7fa3fb79cb678785234bca7d2b235a
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
 EBUILD uudeview-0.5.20-r2.ebuild 915 BLAKE2B cb90d99429ff87ae32bb43766ff681eefc2901f577e98deb0151aa7f1d4d72dbd8a76a57083e27acca98f30c7cb8eec64fdc15adc8e7f9c920662c2af459cd00 SHA512 4b159d03eb9ea9621d1a6bdc4e9cb72dfb1412da77d6bb00278af707bc12689f67145fa408c89139c4139bec1e38d19e05312d90699dd4702b5d0cd84f393292
+EBUILD uudeview-0.5.20-r3.ebuild 1078 BLAKE2B 659eed5c73bdea7feb6eb3cd24ddbdba6c612615b3e5973cebef3ff9637b3ce73b33fc6b4d7cfca1e2c12c185e4468a002c92ec30e5cb267d29af7137e923f7b SHA512 cb019c466c990bcad9fd49f796b71cef40ae390da0c59d7feb14614e657b0a36b40e05c19438042c06b4aaee0937112296f8f2e8e178138d9828d756596212c7
 MISC metadata.xml 217 BLAKE2B 4c798b28d6d7cb91ce9efa46084d222e24f1f62814b89dc32e8ee4c2d2e761392fa46cb368de68fdaf0c020acc5603a124b3a96edaa8e6ee333ba3f71ea59ad5 SHA512 83aaf1cf450d1a0769b0d5bc9533bb17e683dd88d04d3318da131cd1c8c66492451b9518f9f2b08d144ac0a2ba4113ed09ffaff1b7c4779f6c35bd7bdcabb874
diff --git a/app-text/uudeview/files/uudeview-0.5.20-fix-function-definitions-clang16.patch b/app-text/uudeview/files/uudeview-0.5.20-fix-function-definitions-clang16.patch
new file mode 100644
index 000000000000..2ed3dd572be0
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-fix-function-definitions-clang16.patch
@@ -0,0 +1,134 @@
+Clang16 will not allow implicit function declaration, implicit int etc. by default.
+This patch overhauls the source code to build with clan16 defaults.
+
+Bug: https://bugs.gentoo.org/874960
+
+Original patch by Pascal Jäger <pascal.jaeger@leimstift.de>,
+minor adjustments by Hanno Böck.
+
+diff -Naurp a/inews/clientlib.c b/inews/clientlib.c
+--- a/inews/clientlib.c	1996-06-06 21:41:07.000000000 +0200
++++ b/inews/clientlib.c	2022-11-26 18:32:09.383423565 +0100
+@@ -14,6 +14,7 @@ static char	*sccsid = "@(#)clientlib.c	1
+ #include "../config.h"
+ #endif
+ 
++#include <arpa/inet.h>
+ #include <stdio.h>
+ #ifndef FOR_NN
+ #include <sys/types.h>
+@@ -52,6 +53,7 @@ static char	*sccsid = "@(#)clientlib.c	1
+ #endif
+ 
+ #include "nntp.h"
++#include "clientlib.h"
+ 
+ FILE	*ser_rd_fp = NULL;
+ FILE	*ser_wr_fp = NULL;
+@@ -133,7 +135,7 @@ char	*file;
+  *			for reading and writing to server.
+  */
+ 
+-server_init(machine)
++int server_init(machine)
+ char	*machine;
+ {
+ 	int	sockt_rd, sockt_wr;
+@@ -194,7 +196,7 @@ char	*machine;
+  *	Errors:		Printed via perror.
+  */
+ 
+-get_tcp_socket(machine)
++int get_tcp_socket(machine)
+ char	*machine;
+ {
+ 	int	s;
+@@ -218,7 +220,6 @@ char	*machine;
+         * fails.
+         */
+        if( (hp = gethostbyname( machine ) ) == NULL ) {
+-               unsigned long inet_addr();
+                static struct hostent def;
+                static struct in_addr defaddr;
+                static char *alist[1];
+@@ -344,7 +345,7 @@ char	*machine;
+  *	Errors:		Printed via nerror.
+  */
+ 
+-get_dnet_socket(machine)
++int get_dnet_socket(machine)
+ char	*machine;
+ {
+ 	int	s, area, node;
+@@ -427,7 +428,7 @@ char	*machine;
+  *	Side effects:	None.
+  */
+ 
+-handle_server_response(response, server)
++int handle_server_response(response, server)
+ int	response;
+ char	*server;
+ {
+@@ -502,7 +503,7 @@ char *string;
+  *	Side effects:	Talks to server, changes contents of "string".
+  */
+ 
+-get_server(string, size)
++int get_server(string, size)
+ char	*string;
+ int	size;
+ {
+diff -Naurp a/inews/clientlib.h b/inews/clientlib.h
+--- a/inews/clientlib.h	1996-06-06 21:41:07.000000000 +0200
++++ b/inews/clientlib.h	2022-11-26 18:27:59.711248861 +0100
+@@ -9,3 +9,7 @@ extern	int	server_init();
+ extern	void	put_server();
+ extern	int	get_server();
+ extern	void	close_server();
++
++extern	int	get_tcp_socket(char *machine);
++extern	int	get_server(char *string, int size);
++extern	int	handle_server_response(int response, char *server);
+diff -Naurp a/inews/inews.c b/inews/inews.c
+--- a/inews/inews.c	2004-01-29 03:14:19.000000000 +0100
++++ b/inews/inews.c	2022-11-26 18:32:26.200435328 +0100
+@@ -39,15 +39,20 @@ static char *sccsid = "@(#)inews.c	1.16
+ 
+ #include "conf.h"
+ #include "nntp.h"
++#include "clientlib.h"
+ 
+ 
+ #define	MAX_SIGNATURE	6
+ 
++int strneql(char *a, char *b, int n);
++void gen_frompath(void);
++int valid_header(register char *h);
++
+ extern	FILE	*ser_wr_fp;
+ 
+ char	host_name[256];
+ 
+-main(argc, argv)
++int main(argc, argv)
+ int	argc;
+ char	*argv[];
+ {
+@@ -254,7 +259,7 @@ append_signature()
+  * a From: line in it.
+  */
+ 
+-gen_frompath()
++void gen_frompath()
+ {
+ 	char	*full_name;
+ 	char	*cp;
+@@ -330,7 +335,7 @@ gen_frompath()
+  *	Side effects:	None.
+  */
+ 
+-strneql(a, b, n)
++int strneql(a, b, n)
+ register char *a, *b;
+ int	n;
+ {
diff --git a/app-text/uudeview/files/uudeview-0.5.20-format-string-warning-inews.patch b/app-text/uudeview/files/uudeview-0.5.20-format-string-warning-inews.patch
new file mode 100644
index 000000000000..de53717a3cbe
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-format-string-warning-inews.patch
@@ -0,0 +1,11 @@
+--- a/inews/inews.c	2022-11-26 18:44:03.788039229 +0100
++++ b/inews/inews.c	2022-11-26 18:44:47.376080190 +0100
+@@ -303,7 +303,7 @@
+ 			putc(*cp, ser_wr_fp);
+ 		else {		/* Stupid & hack.  God damn it. */
+ 			putc(toupper(passwd->pw_name[0]), ser_wr_fp);
+-			fprintf(ser_wr_fp, passwd->pw_name+1);
++			fprintf(ser_wr_fp, "%s", passwd->pw_name+1);
+ 		}
+ 
+ 	fprintf(ser_wr_fp, ")\r\n");
diff --git a/app-text/uudeview/files/uudeview-0.5.20-string_format_issue.patch b/app-text/uudeview/files/uudeview-0.5.20-string_format_issue.patch
new file mode 100644
index 000000000000..7cbc584f5b47
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-string_format_issue.patch
@@ -0,0 +1,24 @@
+Description: Fix potential security issue (arbitrary string being passed
+ as a format string to fprintf).
+Author: Andrew Shadura <andrewsh@debian.org>
+
+--- a/unix/uuenview.c
++++ b/unix/uuenview.c
+@@ -310,7 +310,7 @@ SendMkCommand (char **rcptlist, char *to
+   }
+ 
+   if ((*rcptlist = (char *) malloc (strlen (towhom) + 16)) == NULL) {
+-    fprintf (stderr, "error: Out of memory allocating %d bytes\n",
++    fprintf (stderr, "error: Out of memory allocating %zd bytes\n",
+ 	     strlen (towhom)+16);
+     _FP_free (command);
+     return NULL;
+@@ -483,7 +483,7 @@ AttachFiles (char *towhom, char *subject
+       if (_FP_stristr (input, "multipart") != NULL) {
+ 	/* it is already a multipart posting. grab the boundary */
+ 	if ((ptr = _FP_stristr (input, "boundary=")) != NULL) {
+-	  fprintf(thepipe,  input);
++	  fprintf(thepipe,  "%s", input);
+ 	  strcpy (boundary, ParseValue (ptr));
+ 	  hadmulti = 1;
+ 	}
diff --git a/app-text/uudeview/uudeview-0.5.20-r3.ebuild b/app-text/uudeview/uudeview-0.5.20-r3.ebuild
new file mode 100644
index 000000000000..903bd6b43754
--- /dev/null
+++ b/app-text/uudeview/uudeview-0.5.20-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="uu, xx, base64, binhex decoder"
+HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/"
+SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-bugfixes.patch
+	"${FILESDIR}"/${P}-CVE-2004-2265.patch
+	"${FILESDIR}"/${P}-CVE-2008-2266.patch
+	"${FILESDIR}"/${P}-man.patch
+	"${FILESDIR}"/${P}-rename.patch
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-fix-append_signature.patch
+	"${FILESDIR}"/${P}-string_format_issue.patch
+	"${FILESDIR}"/${P}-format-string-warning-inews.patch
+	"${FILESDIR}"/${P}-fix-function-definitions-clang16.patch
+)
+
+DOCS=( HISTORY INSTALL README )
+
+src_prepare() {
+	sed -i "s:^\tar r:\t$(tc-getAR) r:" uulib/Makefile.in || die
+
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-tcl \
+		--disable-tk
+}
diff --git a/app-text/xml2rfc/Manifest b/app-text/xml2rfc/Manifest
index 48b845ae317a..63a705338a7b 100644
--- a/app-text/xml2rfc/Manifest
+++ b/app-text/xml2rfc/Manifest
@@ -1,4 +1,6 @@
 AUX xml2rfc-Remove-broken-test.patch 3455 BLAKE2B a5faf688b52a7dc34a99e096a56433103e01f28f8c4b4cf75b4816683b1e7fcd60131d2170f5fdf65fc1c4621099694de682e5b017d6d045bc795bf3f8ecbd31 SHA512 9f54ef323f7f89f89b847fc00731115d2ee8302b7352c43549176cbdcafd79edd8a91dcf2e329e690833bb19f0f6ed0fd8ca5ee22e92299df54b505f2af0aaa7
 DIST xml2rfc-3.15.2.gh.tar.gz 2849091 BLAKE2B e792d07a2c8123dc32f4c2cfe794420f98db13da1812a4a7e82a4f2a2e2e70fa0e6b7385e189e70eba47c9be7e0ac281d3858437103b828ea8dbaaf8cef73b87 SHA512 5953ae40ad479b0aa6ab90f08f235ceddfa9c7e1edd868ee43bfd261f4c4d0fdfbbe052ff8a3274c39d283efc1105a0be3b4578fa372269f3274a72acdc950e8
+DIST xml2rfc-3.15.3.gh.tar.gz 2857354 BLAKE2B 936c1f0c37d8de85b7a9966b6239da55dca090c3cb3e712a1198683244e436ccf6827fc6d00325e8c13a7be829af6954d311f690e4aa0367f2399c4d5cf9321f SHA512 3022bfc071e9bbef2e8e6b73c9c6539690e18f0935e3d22f99d1fc3faa642b75f998d6dfbd8d8c019f7fc789c38957994e06667870638dff8e907c928578c904
 EBUILD xml2rfc-3.15.2.ebuild 1448 BLAKE2B 9bae39e448d758f2cc3e945a934523adff76f241cce9b6805f21752075251ed439e020fa3590d7cd557be10b1e0b6cfbbc6d187239a370c2c7e1506e50998dd0 SHA512 14fe82df07f7e4ec7138a0f5a071af148963934df62ebebdc9bdb1d119b3d47f318d5422e22b9db89136cae3be2af9ffa657d492ee7f5816bef161639cf8749b
+EBUILD xml2rfc-3.15.3.ebuild 1448 BLAKE2B 3c6f94c413df5513645982d1096d9001fb94331e76b0cee66f1c73197ae400e43c88aa8e88a31e1e35dc1b8f9e147b8c7b6752e68ff4b1a310493e0257d0cad9 SHA512 0fabeb6d0e1f77f025e14c12061f9cd6870f5ce4ddd4e96200f2bf21ffb0ccc03ad739a0fc8cbb639783742f51c9c4775bb41defbb649047ff5e57d1f8fa0aec
 MISC metadata.xml 374 BLAKE2B 3514fd485c7ca895f1b9f4a809ed97bb55396c1abd6a52ae6602e61b836fac3a0fbcbeec7dcb0789a6510cabb9920a33bfae4dfeb9bfba86ad9d02fbf917a720 SHA512 0e4697e08615993939416355b5d112f5f6ab1aad0bc74a3e33f6d3e7d0178ddf9b5fba70aa50fc6babed1ca27d89d1b0bff53223c1a55e636e82b6c617860cb9
diff --git a/app-text/xml2rfc/xml2rfc-3.15.3.ebuild b/app-text/xml2rfc/xml2rfc-3.15.3.ebuild
new file mode 100644
index 000000000000..1c0c63b13130
--- /dev/null
+++ b/app-text/xml2rfc/xml2rfc-3.15.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generates RFCs and IETF drafts from document source in XML"
+HOMEPAGE="https://ietf-tools.github.io/xml2rfc/ https://github.com/ietf-tools/xml2rfc"
+SRC_URI="https://github.com/ietf-tools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+RESTRICT="!test? ( test )"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		dev-python/dict2xml[${PYTHON_USEDEP}]
+		dev-python/weasyprint[${PYTHON_USEDEP}]
+		media-fonts/noto[cjk]
+	)
+"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/ConfigArgParse[${PYTHON_USEDEP}]
+	dev-python/intervaltree[${PYTHON_USEDEP}]
+	dev-python/google-i18n-address[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/xml2rfc-Remove-broken-test.patch"
+)
+
+distutils_enable_tests setup.py
+
+#src_test() {
+	# https://github.com/ietf-tools/xml2rfc/issues/561
+#	emake tests-no-network
+#}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 37c73784debd..e7b2072510dc 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index e768f5228ff9..7cc5b120cb29 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -4,12 +4,12 @@ DIST gradle-bin-7.2.zip 157058280 BLAKE2B 918213df58ac2afbd075c74588f60676cd7dc9
 DIST gradle-bin-7.3.3.zip 158875257 BLAKE2B 94f86e06da3eae4a9522d35a28577d033d64ce1bc2f36d0f5c1992e9b92ec311d25bd98bbeaf4b8a9869f22d93e14c88952e12166e436a0a6c206541d1f967aa SHA512 03f2bdd77202788cd43bb3e3a6390340f4d083d69ade5a53e0163204fb85307f5bbbbf4e04077c6ae558bc36ab3c478674f941079bc14a8344f55631fbba1490
 DIST gradle-bin-7.4.2.zip 159315974 BLAKE2B c7c8dbe82d22dec699d1997a781f3a66110c9910dfe67df2304c48cead96c130ca072550b8c5fa2362744cd2ea3c9723c45a6ecf6e0737fe3c9b7e286b44f4ae SHA512 2e1d05486baa9661d5c8ffead2df87874a66f6cfc958ee6840432b89d221d8b0af9e3cad3675766f5413d12aa61c5b5fb0dd82f4164e5da3022865eba9ceadbf
 DIST gradle-bin-7.5.1.zip 166101707 BLAKE2B e018f8ae0e4cbe1fff2e3fb3029ef4c3f35e1bf541ce75f22561e16c43d8501c2f2501db72081656a836ab1c3358020dbf0be3499e7c16b385d9940c852c62ae SHA512 89189d529df1258a01ad2e6c38b1374dfb3a1440706c1c7f27ace89b6fd5b6849f9809f209e3e410f226aeeb9348d144de70397ac94b4e59fd311a2b0dee0dc9
-DIST gradle-bin-7.6_rc3.zip 165543328 BLAKE2B d31211559f7fa9ad7f297f7c0716603ac5751f817318c77955379d85eb1ad53988a6104605e33d1c12203c0ef4d6b0718b642ca7c1d3e3c37b687303a150aa68 SHA512 bab9c4bf9e958a103e815c309f41dc924edb400a9c0694e96ff11db8785986bdb5e14a3a7f94c6008d51eb4ecb108953cc4c38c627e53fd2da23da0c412f3f47
+DIST gradle-bin-7.6.zip 165398808 BLAKE2B e9ffb8157184a4977f72a5267501ad3bf7201ad77216b64cc99e9c54e4c4787a0c26ca94302cc507ca747dd4c073bfdf8e9ae931b1b329d6d7df339e26d665a5 SHA512 5c5b9ade91898ec2fe142ff98dc7ae681a9f3b923ce40998a731cb84fdfcdbde6510cc9da026a9359526569e37472b06c1a6bc5a2794d2af5e9d6f1d13a21ac8
 EBUILD gradle-bin-6.8.3.ebuild 1107 BLAKE2B 349fbd166d7051019a6861ff9b4cf3551b4da9931beb867b55ccdf74094a477bd2e4607763de59d037b7e48d33ae6ffe033853cfc6baf54f1c3ffb878dacd1a2 SHA512 29a5b48b85ea22e5446e210d2ca05e4bdef13f89607b7fb19e8463f478554b08edb68b0ccbe6002b5c1600a25a01507c3297aad9ac608c6cc9880473f8d61a93
 EBUILD gradle-bin-7.1.1.ebuild 1107 BLAKE2B 349fbd166d7051019a6861ff9b4cf3551b4da9931beb867b55ccdf74094a477bd2e4607763de59d037b7e48d33ae6ffe033853cfc6baf54f1c3ffb878dacd1a2 SHA512 29a5b48b85ea22e5446e210d2ca05e4bdef13f89607b7fb19e8463f478554b08edb68b0ccbe6002b5c1600a25a01507c3297aad9ac608c6cc9880473f8d61a93
 EBUILD gradle-bin-7.2.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
 EBUILD gradle-bin-7.3.3.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
 EBUILD gradle-bin-7.4.2.ebuild 1107 BLAKE2B a8d579cbd751718738297284e0868812ee3cb67d911d143ee6711150c3e7d69c9c55f7ab0bf44b554935539ee20d0c945a4f10c914a2bcb471d2c3be4d249346 SHA512 3cfcbdf0bea512bb3e82053ad824953b5d95d7954796ea6f1846d46d8812e7b482608f1c8e60d30982127e05ad5fd29ae660965afd9176c872618dade74c821e
 EBUILD gradle-bin-7.5.1.ebuild 1107 BLAKE2B cb48b2f2b2f508f171c139c335ee61775534adedee72526644ca265e583018c46bb61eeaf5646ac206091df27d665c128622a6818230fc77d69dd593e665663d SHA512 b0a99794e4b908bf316fdb05a87c310a6aba05299dc49c6db873243c6202cd9a6bd9687a9d9203253f9ca7816f7af36edb68cee7b509110b438e966d2c161531
-EBUILD gradle-bin-7.6_rc3.ebuild 1109 BLAKE2B 7cfc0537a256cf0cc1dc7d8c369dac854251ee54064108795eae5720df97d9e9b3fac72fc41fb7443e2d0b85396dcd4563f19b56f1e0663c7dbe1e3447391bde SHA512 3160f5aa339b6e75ca0f74f14275323566a4688c84c6ba761d27ba39e0b497e09a3fe6a8790124d6469833fe5d329dc2a5b62a66e195f2499bb11d6368a218fb
+EBUILD gradle-bin-7.6.ebuild 1109 BLAKE2B 7cfc0537a256cf0cc1dc7d8c369dac854251ee54064108795eae5720df97d9e9b3fac72fc41fb7443e2d0b85396dcd4563f19b56f1e0663c7dbe1e3447391bde SHA512 3160f5aa339b6e75ca0f74f14275323566a4688c84c6ba761d27ba39e0b497e09a3fe6a8790124d6469833fe5d329dc2a5b62a66e195f2499bb11d6368a218fb
 MISC metadata.xml 356 BLAKE2B fa5433b47d358144596ec5c02ea3d766d13561cbf383a2dcb492ca66f9ebae593e12534630edf229ee6e136f336a0ff091dedeb67e155cb43bd219284fd1f4d3 SHA512 d8e58592957b0707bb016273f8209e3ba975a907a691b60d610e8ef4204a62ed89e4475b8b198659afb9f9b654b71c0f52eb3ce7a00e46fa17831da69dc24470
diff --git a/dev-java/gradle-bin/gradle-bin-7.6_rc3.ebuild b/dev-java/gradle-bin/gradle-bin-7.6.ebuild
index 8dedd9ecd1ef..8dedd9ecd1ef 100644
--- a/dev-java/gradle-bin/gradle-bin-7.6_rc3.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-7.6.ebuild
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 08c5155c3f60..dd89da241af5 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,7 +1,3 @@
-DIST mill-bin-0.10.7 65704975 BLAKE2B bd6cb205f58ef51eb43f45f5980de0dc1afbfb3b0a56ce81c541e88cae5d3cdcb65efcaffb90bd3a7b53a33410b26873d9db3a4863edf564a1ccb10c7be34e71 SHA512 9323212fd773de602ec8dbd1bf776169b402e9c60decc424b258254cc293cb4675a4caeb18addf853a7b1bdf0555cb3377e97a0dcf491b87286777c77c4232b5
-DIST mill-bin-0.10.8 65855208 BLAKE2B 4d165055a00f0373387064b98b8bf3548854213ad7a7317d7a8a03264fece5e882eb1705c45176e312a9444ab3e9f741ec638792e187a7e1b0941e1ac0862bd1 SHA512 9864c70b8a32f1ab451e07ab6e91f6fd9bf20e2cf400edca999c7585316696d90f446f68842413ae552c71f782d1687df5679857748dcc20c8d6bc7d38255b81
 DIST mill-bin-0.10.9 71023828 BLAKE2B 6cd71ad3a293b92957b504b850110103290f0017416c370f6de172247e96a42daffe94f7460325bff89b3136e3890eddb0ff7857418a0166327684e785a8e956 SHA512 494ad57e036180a285e44ff24ab8a7070b1b444e4267eb9ea76823f3717db4ca7bcab17013932764ed04fd7127272d87fef08cb59bc43ae257a76fdd715581e9
-EBUILD mill-bin-0.10.7.ebuild 480 BLAKE2B 975ae40b61d1aee9e011cd04fddac1b6adfb788cfb6218648284330e1d936611b73473e82383524e4be1a4ce6bff26bcc047bfb1ab9c67c9c646a85d892bdff4 SHA512 1625db9ae485f31f37033d30c5de765850f77a57d22f772645c38de7077f87431d41826241e108b9f8deab2d8e04bea4b98e7aeaba35a13ca1693888b6d1e67f
-EBUILD mill-bin-0.10.8.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
-EBUILD mill-bin-0.10.9.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
+EBUILD mill-bin-0.10.9.ebuild 480 BLAKE2B 975ae40b61d1aee9e011cd04fddac1b6adfb788cfb6218648284330e1d936611b73473e82383524e4be1a4ce6bff26bcc047bfb1ab9c67c9c646a85d892bdff4 SHA512 1625db9ae485f31f37033d30c5de765850f77a57d22f772645c38de7077f87431d41826241e108b9f8deab2d8e04bea4b98e7aeaba35a13ca1693888b6d1e67f
 MISC metadata.xml 464 BLAKE2B b60279b753026e5ba2247448a3e009a02b1d017cd3269fbf518783dc7f0a59adfdea03201123891d113da14f9d5a3cafd66628d71037064387086b622412994f SHA512 d7eeb833078c86092aaebc30a92d5029aea2ecbd1274c0f8eb86bc9015bf1bd1a2ab91b50ee0fc9816a661ace9635f4c06e9dcfb9d0bf1402b6f94867eb4e505
diff --git a/dev-java/mill-bin/mill-bin-0.10.7.ebuild b/dev-java/mill-bin/mill-bin-0.10.7.ebuild
deleted file mode 100644
index 4b4375e44bc5..000000000000
--- a/dev-java/mill-bin/mill-bin-0.10.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN%-bin}
-
-DESCRIPTION="A Java/Scala build tool"
-HOMEPAGE="https://com-lihaoyi.github.io/mill/"
-SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="amd64 x86"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	newbin "${DISTDIR}"/${P} ${MY_PN}
-}
diff --git a/dev-java/mill-bin/mill-bin-0.10.8.ebuild b/dev-java/mill-bin/mill-bin-0.10.8.ebuild
deleted file mode 100644
index e8485c57dfd6..000000000000
--- a/dev-java/mill-bin/mill-bin-0.10.8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN%-bin}
-
-DESCRIPTION="A Java/Scala build tool"
-HOMEPAGE="https://com-lihaoyi.github.io/mill/"
-SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	newbin "${DISTDIR}"/${P} ${MY_PN}
-}
diff --git a/dev-java/mill-bin/mill-bin-0.10.9.ebuild b/dev-java/mill-bin/mill-bin-0.10.9.ebuild
index e8485c57dfd6..4b4375e44bc5 100644
--- a/dev-java/mill-bin/mill-bin-0.10.9.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.10.9.ebuild
@@ -8,7 +8,7 @@ MY_PN=${PN%-bin}
 DESCRIPTION="A Java/Scala build tool"
 HOMEPAGE="https://com-lihaoyi.github.io/mill/"
 SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ab34b6eb2c32..c2c517d6b449 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/gnucobol/Manifest b/dev-lang/gnucobol/Manifest
index 20ef8d104484..e84046cd4a1e 100644
--- a/dev-lang/gnucobol/Manifest
+++ b/dev-lang/gnucobol/Manifest
@@ -1,5 +1,4 @@
+AUX gnucobol-3.1.2-gentoo.patch 494 BLAKE2B c701946439e87fddcd7ea8a5247fbd4a4d24badb14579f257933f4116262f91edecae376248b2f87d6e7ce4006aa07424a6a2fbfbf808274c43adb8815e9acec SHA512 95916c5359c564bc300c0125198c4174b65f3ef62dd00f3ac3097b4f04cdbf0b3f99cdbf7869bb7a9a18e7b0ccb14fd47507c936ce7fad18236838e428079bf3
 DIST gnucobol-3.1.2.tar.xz 2198512 BLAKE2B ccf9252bc4d5e64e966cea483981da36155767a5879967be7226fbcd8f13d8b427558de3a25cc8638f9156882b6f368acbf3e84d5e2ee68bd5754a6a513ac7d6 SHA512 738149c9d3e01140e4036b041f4eaa6c7caf7848a87146a3dd9940a9f17006805fd3c6b169d346bf01a0c2e671655080978c0f3182a85389f8f8a373ca8c1435
-DIST open-cobol-1.1.tar.gz 1007791 BLAKE2B 9154590626d885a75043c2426c1fafb146e0f7213d05f353f6d01c0e6b8cd8073e12f454a19ae1d3c712606f1c15958f241a7c54f76c995d0ce396d1eba1a0b0 SHA512 eb06cec456425ba5f4a091ae4ac0bfd14f38549bc147c606a022804f602102df6dbf0d399614f0eda49d50dee17eef55087748853a8cc8bdd1248f94fd09110c
-EBUILD gnucobol-1.1.ebuild 930 BLAKE2B aaa284174e8c56a5747adc934305425854ff74f1f3abb7d27a343b5373b278d7e5bf48a03284dc431fcfe79567e8430d9e24efb0c82745ad91da53f2eda481b5 SHA512 e13dbf1d2ee43567bfa74d97fceb224004ac8acc9f06e123f94c4d1c4fbcedf1b8d5a67edbb86604f027c464578cc0ca91bf38b292a84c5f05e9079025b03ee7
-EBUILD gnucobol-3.1.2.ebuild 784 BLAKE2B 3d322e314523d5ae413e1c369bdbeaaae9ea921a277085be78c64ef1887aad6dca0c76b34102f1b0b3e3e18bd6e7f858c9485dd0aa932fe48cbf7d394fa178bf SHA512 092d48ea3fa2606e5126909ad4bf8d185b674500ee588e5d45122da321920a9fac972c093c9e684924bd513720aa5f799fa907cb22de8499f2023f9b36f28b30
+EBUILD gnucobol-3.1.2.ebuild 889 BLAKE2B 9b533d18a5c999b72a6560313365b7ceb40f634159ee80a7f3033b9d11aae317ade53462e903b671872393d03a9b8b52675f408ca4b0c3b9a2f899bb8937f7fa SHA512 f38ab2718cf39b3a875ebf345f31923e4cb74b8064cebed04d145fa756b27a58e99af2766cd81362360e65063120260c933d1091dc21e2664065206b56c23b76
 MISC metadata.xml 443 BLAKE2B a5db53a5177af3154eb6c21c12dcd6ddf3d76445143b743768661fe242d9d2aeac41a630e24432e1578d28e4817a02b4fc80b72c1c3719e7cb7499adda4c4245 SHA512 11e0327d7d55ce1c89252688a2a11dfd0e40355dd982f630fab3e2fd5ee6de3ad6264a03a4d409f4c602d28f8c71b39b5c16752815e984f0c140ccd7caa7bf61
diff --git a/dev-lang/gnucobol/files/gnucobol-3.1.2-gentoo.patch b/dev-lang/gnucobol/files/gnucobol-3.1.2-gentoo.patch
new file mode 100644
index 000000000000..64c33a2b1dee
--- /dev/null
+++ b/dev-lang/gnucobol/files/gnucobol-3.1.2-gentoo.patch
@@ -0,0 +1,10 @@
+--- a/extras/Makefile.am	2022-11-26 16:51:38.799201541 +0100
++++ b/extras/Makefile.am	2022-11-26 16:52:00.112873141 +0100
+@@ -30,6 +30,6 @@
+ 
+ SUFFIXES = .cob .$(COB_MODULE_EXT)
+ .cob.$(COB_MODULE_EXT):
+-	("$(top_builddir)/pre-inst-env" $(COBC) -m -Wall -O2 -o "$@" "$<" || \
++	("$(top_builddir)/pre-inst-env" $(COBC) -m -Wall -O2 -g -o "$@" "$<" || \
+ 	 "$(top_builddir)/pre-inst-env" $(COBC) -m -Wall     -o "$@" "$<" || \
+ 	 "$(top_builddir)/pre-inst-env" $(COBC) -m -Wall -vv -o "$@" "$<")
diff --git a/dev-lang/gnucobol/gnucobol-1.1.ebuild b/dev-lang/gnucobol/gnucobol-1.1.ebuild
deleted file mode 100644
index fa480cae9180..000000000000
--- a/dev-lang/gnucobol/gnucobol-1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="open-cobol"
-MYP=${MY_PN}-${PV}
-# Future proof pkg if maintainer or p-m want to bump to latest GNUCobol
-
-DESCRIPTION="an open-source COBOL compiler"
-HOMEPAGE="https://sourceforge.net/projects/open-cobol/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MYP}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-# License must be changed to GPL-3+ if/when pkgmove is done
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="berkdb nls readline"
-
-RDEPEND="dev-libs/gmp:0=
-	berkdb? ( sys-libs/db:4.8= )
-	sys-libs/ncurses
-	readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-S="${WORKDIR}"/${MYP}
-
-src_configure() {
-	econf \
-		$(use_with berkdb db) \
-		$(use_enable nls) \
-		$(use_with readline) \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-lang/gnucobol/gnucobol-3.1.2.ebuild b/dev-lang/gnucobol/gnucobol-3.1.2.ebuild
index 8202373ea8e8..b6419a90cf82 100644
--- a/dev-lang/gnucobol/gnucobol-3.1.2.ebuild
+++ b/dev-lang/gnucobol/gnucobol-3.1.2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit autotools
+
 DESCRIPTION="A free/libre COBOL compiler"
 HOMEPAGE="https://gnucobol.sourceforge.io/"
 SRC_URI="mirror://sourceforge/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
@@ -24,6 +26,13 @@ BDEPEND="sys-devel/libtool"
 
 DOCS=( AUTHORS ChangeLog NEWS README README.md )
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_with berkdb db) \
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 8746b6c1d4c3..210894cd3ba5 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -22,7 +22,7 @@ DIST ruby-3.0.5.tar.xz 15880196 BLAKE2B 581aa202f6b1b5c72bb18d486c4f74ec87a6c2dd
 DIST ruby-3.1.2.tar.xz 15101588 BLAKE2B 3f06d432f023d65c4808379140c18a922ad6c6443cf7f4b5ed3d44d2e0b7e19cbf0064b5214b46f3c5335f4e61ff473943fd565082ef0b645558b83e89dd0533 SHA512 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21
 DIST ruby-3.1.3.tar.xz 15300224 BLAKE2B f3ef9031c2902bf5d624dce0a4584724e7a9099fb8b33b86a99026c37f4b91f23ff35c23a3cd7715bf739e6c539cc3612b5a750d00cbacf8e4ebcc70bbc85f41 SHA512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69
 EBUILD ruby-2.7.6.ebuild 7913 BLAKE2B 8330eaa1563f2880730eee59532de22372aad9bc8c7ea94ee489869100875890316306ee5edc268acc105be2a54b2fdb0a456364290e69bd5b046acfbb189012 SHA512 224412dcc37ec8368907190e14ac3dfe16f5636b442d92f029b55a1cfdffa036828c279e8da9af61ccbd3c218e138068e35e3cc2d2614424c15395281a2cad9a
-EBUILD ruby-2.7.7.ebuild 7927 BLAKE2B 50adcd38077c99ff8c912fce61942d3aa959c3d158bd14acfa0adaa40072e1e5e594fff9ad2f878ea66922bd76b56d161cf316b47c94c8aa03840a5edb60c45a SHA512 37797405276eee024dafeec170d46e9608fd13203d18f3e51615f3b66903112d44a5cfd4338d7a5a7cf04c567f8227c35b179bdcd9fb40a8fc215c6a444f4b9d
+EBUILD ruby-2.7.7.ebuild 7921 BLAKE2B 165eb81e6c360c478d364566e2a2c95b162aae7181fc1a34f73bfbb139609003c5af6465bb6b9ebd2d3ab91cfb9c3c47aee8088167500e1be6891c45eacee573 SHA512 ea5d07e0e6243ac6e5daba45f4f00106a2dbefdb79c2b1231e60a63a542172d016ee717052bd16cac11f023539686143e7dc3fb62cb53d2eb3664e4ba97005de
 EBUILD ruby-3.0.4.ebuild 7768 BLAKE2B b20ea1f1c0cbc583a41587f7c32e83def9a50045cc6bf6607a0ef6f90b6712d0bc242abb5ad15a152b3b6b037d3038c38006e34b4b6d777959ec84250ccae6fa SHA512 9ae32072ad97f3fe39a98bcd6ec249a6d1be97e8104b8482dd3d56c53b945c154cac4b67012938fb9b87352e984c510cd48c9e0ed602577c90881b3fb845ec2f
 EBUILD ruby-3.0.5.ebuild 7774 BLAKE2B 7ccf3d999e50ee855c60969763c057dbe9354b090fe9928dddd322b6189f526b2e94504f9fd6b0f352f3dca039fd74fec3770f1777ce7f7ae9ec0e41e798907d SHA512 b10709b08711b5f3292813f60d0fca56fbf1d66e1893312e77812759ee056ec8fe5883d94d57b103947d518e0ec392e02bddb8370cf6508366f8293715a2ef62
 EBUILD ruby-3.1.2-r1.ebuild 7386 BLAKE2B a9d1ddefbfb87658518a66a49cbd69b3f17907c65997468489356510733f51a8e02b560303e0581dcfdecd6ccf0c2b4ac57c21b4b69505d151bc15c9f1d508ee SHA512 ada276970c6f78ccb8085f8c2b898bc38170b62efb32f3fa024b8852f60bd3f723c4d3c9c0b6cd1b6877486f91372a6880c38ee01aea2cf3bafdc0abe85d6553
diff --git a/dev-lang/ruby/ruby-2.7.7.ebuild b/dev-lang/ruby/ruby-2.7.7.ebuild
index af14585afcc4..d3f3a3c6699d 100644
--- a/dev-lang/ruby/ruby-2.7.7.ebuild
+++ b/dev-lang/ruby/ruby-2.7.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c499a24e1076..b115be544cd0 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 3244812e02c6..88e9d6b4ad25 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -5,7 +5,7 @@ AUX apr-util-1.6.1-libtool.patch 533 BLAKE2B d942a897aaeeb543e4dbb4fbaac7b54f4ac
 AUX apr-util-1.6.1-mariadb-support.patch 4929 BLAKE2B 9f8a06e657386f5f773642f36f0897bba5e55270e860f2f1edc86ebe44214395a64e70c3f984f324328a8f7a6276c86cb46caca16719ab3ad51aff995868818f SHA512 edd5e1cd7d31e7bfb1b166c162ad8c69c704c8e9a09e85770df3b625ed918ed52918a16728a9b4d69370ccc75ade32dd64ef73b31ce6e8dac7a360fe44ca34e7
 AUX apr-util-1.6.1-my_bool.patch 311 BLAKE2B c0fdf523983dc75ff977c8f602678cdd7d0b3e539fc266891e2266fa3b60e0971e93d77f2e28ed95959d8ca62bca4f9f566fefea525c845d49ce545ee6b5a99a SHA512 ed7d7857be8b5d29cc17a7216c1b06134798eb5129d50389bb0d5484a46e19e3169f8cea80cab7f845548e528a2cd9909b72016a7216b402092ae15879db792c
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
-EBUILD apr-util-1.6.1-r10.ebuild 3851 BLAKE2B e009f2170c99b8ca66aaca9d82b694408fb45401e43c38ae34e8be0c315060206fb4a6ebd9cf45b5956dee33db1f5af92b58229a02884b7cfe93a4264dae3e19 SHA512 60fbea6ad3d13513140fc20e48d95fb9ad169d2e7c05087ef8df91623de02d4884f998b505379be460f4068f54a2772c788edad05527014448f1964ff8fb2ac5
+EBUILD apr-util-1.6.1-r10.ebuild 3850 BLAKE2B a29e7433d1b1d39a18389ec93dfbdd82549073ac02e7475ef88be0fe83fe06c8c9b3499adf8eb846e2520a4173d35133fbcf7c952dd61f061d169a856c989368 SHA512 a98d2d40e0e2b54a974ea92e0d2d593f68d6714b76f309c3377c3f181702d27d2b0df8c0f7f24e9939bbf309805f78e6a6435c78826c41cec6b1ad21b3d1cd99
 EBUILD apr-util-1.6.1-r8.ebuild 3787 BLAKE2B 1e4f8ec847da2607556c7cf58773ee5e5a94793d9231168eff0f96eb4ed359a18d87a19c193ba55b8753c123de75e194ef9fad797d60e6808b0a181a9ec8341b SHA512 1c85cb121e872b923188db6fc568ae7f7fa240a051caaa2b8df871deb2012c316402f7457547a3ffaba4d7e477427ccece507978bdba0508bfa232ba4c1fa566
 EBUILD apr-util-1.6.1-r9.ebuild 3837 BLAKE2B 1fc36d425179e148240d3760194ff9a18701a70f8428facf4be230136c36e7f431f7d957c26d0d89e4db9e59a165125d2e3f472530365cb059c59589966b40b2 SHA512 ea1751c1597e08532c1e422a5523de38d8a6c2b9e810c60bb2a2ad87ffd6ccb57b55bd46747a5b7c7f467de04435a71d435c347e6e680c0f2e8e59e06f6de990
 MISC metadata.xml 469 BLAKE2B d4ef8b9223183a322e324290e26e78fd291bfd3e60b48a18d1345f0aaf467302cabb62ae330ee5282bf38fcdf84a020dcca1b32a8351e3494d9fecd723196031 SHA512 727443f6ab071b3c657287a698ccaccea336a3b861f199dd07c4472cd61e1252e2a25f24a86dcdd72cedcfb73fb6cb0ebe0cbdc93220223dab5501e9626ecb4e
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
index b801a51af23c..5b1874c96780 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index a2d9f565d864..aa6a2d077cf4 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -11,5 +11,5 @@ AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4a
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
 EBUILD apr-1.7.0-r4.ebuild 4511 BLAKE2B 74ea0dd4227e2785e1a45eff3d1293d9fe937b57917107e736c0a1b056623eca5524e2bd3fe6c4f53c807e41394beca57513fed1318cf34c2b96abe8dede4c40 SHA512 dcf4320fe8c7ac38b3e89fe32a94fa9f4150d2269fc0e49822a9f488c9de485449f1ffa9e4d370b2f2c8ed1aecf46eea5313dfe779c1b08f55f4baa13bf0ac51
 EBUILD apr-1.7.0-r5.ebuild 4567 BLAKE2B 4a6d38c41ab104532969f0bf6d19815dbdbf9c84de1bd1c66aade7ae37bdfc3d93018b1aac4dadf1f8c25738ad9a8d61ddff7255b0564059d0da1f3840d35d9d SHA512 009766ba30c28970c67364568e4239cf458b7a437644756ed9b6022db830266834b5233ed60db99ae88b0bae54629c5a563fce7b9d8ebaefb408e597ea87d291
-EBUILD apr-1.7.0-r6.ebuild 4671 BLAKE2B a3903416c7070d6c660afec21ba276f2ee8d30f28782c5d0b9cd7b1057794911b817c0b76e1f704d0f6662b4af422806ea6b191db32a24198cddf2fe04358295 SHA512 8732c774951424fbc918f4483f407897befe9dc190ef8b153b0986242dd5de7508cdf144e456895731db010c865da60ab6a1b57d291763878552ee10b4a8e2fc
+EBUILD apr-1.7.0-r6.ebuild 4670 BLAKE2B 91cbaef2a74a384be36f820cdf098d6a2f9a7d3eb0d638d548a79b4edb56d628c014995c73cd866e5c101b0656a09ea94b0a393b1dd1c4d781a27b67f6b49388 SHA512 33199e323f457f44e6bb44c761a56e2604f3bcb3271c3ef6f2dd8591a62d9e119a3fdc6588c1bdcfc09f42ff4941cca0e1a156284f61f5d480f0eea72fb476e3
 MISC metadata.xml 511 BLAKE2B 5b4f31f74a9e3fe93b63bb337b5e0b7396c18439c269de0ec6c8308becf69ac8474d72dc921c80c06321bcaf708d49c9e26ec282036e84a9b03c08858c942980 SHA512 82063beddf8ce88d5f151ddeb8b3b69c10124af1c7b727b4c73885b4b14a427e93cd4164ddd4e3dfcdf7175727a8dffa357f1f14c3daee192a255f8995e6b0b5
diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild
index 61a91f10ea0f..51ca2bf41a67 100644
--- a/dev-libs/apr/apr-1.7.0-r6.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index fe57bb8f7baa..5e99d09aaf66 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,14 +1,9 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
-AUX glib-2.74.0-clang-build.patch 1038 BLAKE2B 3340b6403a351d00d7c26813a09f286177136db8cacdb3010b4f37db37e8ecb24a445cf082b204e94a9e80cf00c8f0ad3d2502fea21bfa2f07f62e0c28fea1df SHA512 115de517a25d4559a964cd0a06ee839601294d26db485cc48089c4f547e325556d258196bcd1bccd89be2986be33db5899442ca3c51e3d40fd22a8d862adf8b9
-AUX glib-2.74.0-crash-gparamspec.patch 820 BLAKE2B 963e9b3550ca8d7abbb72881ce82fd94f207ac846fc138e7ce2409d74812da662615f309c40ffbbf4cdd5911c6ce070741cb06d6cef3c80c89e4f8e28d632f2c SHA512 1d0d0ea2fdf14be8d480e8bf60e93d8e1840da67739c8fe747b4bba2379240b42bc2dc26bf53912627b5ab35e9aa7ad3997876a9ec05aa2b50e71f9634751a89
 AUX glib-2.74.1-gnome-keyring-cpu.patch 3930 BLAKE2B 3da62efaa538e4685475b730626b9d76777874908340a55244e83cd70eaf6b731b5c363155b12db20c6fcf3a7692db047ca6cba65ac03f6c7f2b894af7da2ee8 SHA512 662d12afab80fb3d4af854d0ad1b477cfd27194ea86cbf5ad254a2997381d4eb327554a25d8a397b948c38011aa85d026d8ee477ce959553d292330fa01dd318
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
-DIST glib-2.74.0.tar.xz 5183072 BLAKE2B b21e5a72e2ce3390cbf13601aa902104f1ac1cfbd75181d30cd340f24b5875753f898b229f99c71d47d499be86cddb0191a0072c0c2decc82956a46c16255905 SHA512 5cdadd2f4568c0c3d45083b4d39699abf651e42e020f7bc880cce3ff33d28943118388d17a0632777e843f48009c1f97d5634fde3cb8c69c7c7f35b278ac8225
 DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
 DIST glib-2.74.2.tar.xz 5182312 BLAKE2B 319a8fb793adb7343b77119d7b7839efad6f91b9c7af079f53d54b435067ab12162c4791ca6b8e9b7fd6d269975e9559951cbf80a065072541f407a0d8e2ce74 SHA512 90bb2410f038e47401fc985ff7fe6d1abecec9417254e039ac18e6b0d77e0b8539b975bef84d5f933be8e43c8ceca236bd466622504491e08e71d079d8804895
 EBUILD glib-2.72.3.ebuild 10244 BLAKE2B 3f37fd728f89fabc8bba3a09946a069cf3220d14637089300cac575a1fafc667d9e04a4592552db64db2144c80f9ae697f0597a5110175cdb0fb3c74e95d71e2 SHA512 ad314b8967042ad94110d0c582bb08bdb4df84dbef60f6184223604abdaf311fe1eb056103df0ec19d7fda010b8e90f2054df86ca817f451e0dc6e6b695a530f
-EBUILD glib-2.74.0-r1.ebuild 10285 BLAKE2B dde057709a510d0f63a534449f8b84c4834a833f27f54db7047887345312f736be2bdf6eac871626cde97960628a52e77d97fe33fc8a9756c63898bc257d23ff SHA512 f8a0532d404cfd6ec7e64392f02772517d65e4ec3f043b2f235b24ced5bf02e5fac53964a6341435c13855594e3bfeede62919248e705df439d83ba3dfb6c38b
-EBUILD glib-2.74.1-r1.ebuild 10223 BLAKE2B e2ba4e0bc4cb6bdeca901e5909df3a056dcfdb00b4284bf8d4ebe5c6ff1ebc463b7199ff24b8a5973d3d670c3485e9cb6e00a682650ce31c15a7f76261d8f692 SHA512 ffbd3cecfe06447c60b82e227c2f987749707de4966e75e34cbed7dff687d0e5145217f239caef5106797e7b6f4be61ca6074c5f254ba9e88539902f8e6db177
-EBUILD glib-2.74.1.ebuild 10187 BLAKE2B 199582fe65e0fab8419dcc85697b0992687caf17956d92046f060d761a4e6778a95797982a63db5cc14671b59c42f0e097c8399376e1bb82a84c19592e91f684 SHA512 7c77b9cb108cee711a39f57a1c48ba5ec354e519b3a301ee8c0aed434847eba4851fb1c0e64d4a7ae76397aaf1b9841af889d8f22328e3fd7c92be401f6d0def
-EBUILD glib-2.74.2.ebuild 10187 BLAKE2B 199582fe65e0fab8419dcc85697b0992687caf17956d92046f060d761a4e6778a95797982a63db5cc14671b59c42f0e097c8399376e1bb82a84c19592e91f684 SHA512 7c77b9cb108cee711a39f57a1c48ba5ec354e519b3a301ee8c0aed434847eba4851fb1c0e64d4a7ae76397aaf1b9841af889d8f22328e3fd7c92be401f6d0def
+EBUILD glib-2.74.1-r1.ebuild 10172 BLAKE2B 0920ab3c5ac1187ac6c31c6b9531fe7f5f0b4027a9f084f8620d4a0579b07baa10cf9f93fcc16bea2362bd7b43a25e67e77225702d1e2a35dc47b63e2bbe5b17 SHA512 1644fdff2f7031251b0f5b9e9d71f4ef522660fefcf9c963be73f911b9a283c7448657fc68f5dc679658861cb33c63ba5c0bd4785ecedee1429220e415e5fdb6
+EBUILD glib-2.74.2.ebuild 10204 BLAKE2B 99dc7514e59c7e7241ba5ca9eff5a77165bbfffaec685be34693287692562d6ad3decd8c0c98ee9458b951b55d98f4f3e16d30e72565377f6e1cb257dd8557d4 SHA512 4eca5a10d7a04028ca059b833b5d2941d8ceae13a5a92278aa699a5d751c33e7038a08b7b7e3085bf1509a9d9e3b9553f91e463ef4e28d66e4f75d764ce73530
 MISC metadata.xml 1357 BLAKE2B c9236f5cdb72931175f757cd7b713d924655cbbdbba9a45479564a2fb8f73b490923d62b69e84568dcd8cd47df32f9fa1dd51481c332a85713c17ce6f6af5109 SHA512 6fc9c503e81c78e21904f74cedb9dbce10194b7acaecf3f17098749e33ca2513a96a53142bc8c1d9d196e48d62b8752956c30d4813ac34d0616cdf13de37b33b
diff --git a/dev-libs/glib/files/glib-2.74.0-clang-build.patch b/dev-libs/glib/files/glib-2.74.0-clang-build.patch
deleted file mode 100644
index 23bb0630d028..000000000000
--- a/dev-libs/glib/files/glib-2.74.0-clang-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://gitlab.gnome.org/GNOME/glib/-/commit/37dba1c425f6c3254e9ce72f1c4b7d0f95c2be3e
-https://bugs.gentoo.org/871174
-
-From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
-Date: Thu, 15 Sep 2022 12:55:18 +0200
-Subject: [PATCH] gio-launch-desktop: Fix the G_STATIC_ASSERT expressions for
- clang
-
-The clang compiler requires the static_assert expression to be an integral
-constant expression. `"text"` is not, but `sizeof "text"` is.
-
-Fixes #2740
---- a/gio/gio-launch-desktop.c
-+++ b/gio/gio-launch-desktop.c
-@@ -121,8 +121,8 @@ journal_stream_fd (const char *identifier,
-   /* Arbitrary large size for the sending buffer, from systemd */
-   int large_buffer_size = 8 * 1024 * 1024;
- 
--  G_STATIC_ASSERT (LOG_EMERG == 0 && "Linux ABI defines LOG_EMERG");
--  G_STATIC_ASSERT (LOG_DEBUG == 7 && "Linux ABI defines LOG_DEBUG");
-+  G_STATIC_ASSERT (LOG_EMERG == 0 && sizeof "Linux ABI defines LOG_EMERG");
-+  G_STATIC_ASSERT (LOG_DEBUG == 7 && sizeof "Linux ABI defines LOG_DEBUG");
- 
-   fd = socket (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
- 
-GitLab
diff --git a/dev-libs/glib/files/glib-2.74.0-crash-gparamspec.patch b/dev-libs/glib/files/glib-2.74.0-crash-gparamspec.patch
deleted file mode 100644
index 84edcde4189d..000000000000
--- a/dev-libs/glib/files/glib-2.74.0-crash-gparamspec.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://gitlab.gnome.org/GNOME/glib/-/commit/ea3f17d598d550345e94e4571130e429443e91cb
-https://gitlab.gnome.org/GNOME/glib/-/issues/2770
-
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec   *pspec,
- {
-   GParamSpec *param = value->data[0].v_pointer;
- 
-+  if (param == NULL)
-+    return FALSE;
-+
-   return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
- 
-GitLab
diff --git a/dev-libs/glib/glib-2.74.0-r1.ebuild b/dev-libs/glib/glib-2.74.0-r1.ebuild
deleted file mode 100644
index 505345d23969..000000000000
--- a/dev-libs/glib/glib-2.74.0-r1.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded
-# within ELF binaries on that platform anyway and inspecting ELF binaries from
-# other platforms is not that useful so exclude the dependency in this case.
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	elf? ( virtual/libelf:0= )
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.33
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
-	"${FILESDIR}"/${P}-clang-build.patch
-	"${FILESDIR}"/${P}-crash-gparamspec.patch
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	default
-	gnome2_environment_reset
-	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DG_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
-	fi
-
-	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
-	#if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
-		#case ${CHOST} in
-		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		#*)            export glib_cv_stack_grows=no ;;
-		#esac
-	#fi
-
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_feature selinux)
-		$(meson_use xattr)
-		-Dlibmount=enabled # only used if host_system == 'linux'
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		$(meson_feature sysprof)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=disabled
-		$(meson_native_use_feature elf libelf)
-		-Dmultiarch=false
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	export TZ=UTC
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# https://bugs.gentoo.org/839807
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict /usr/b
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "2.63.6"; then
-			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
-			ewarn "to restart your session for \"Open With\" dialogs to work."
-		fi
-	done
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/glib/glib-2.74.1-r1.ebuild b/dev-libs/glib/glib-2.74.1-r1.ebuild
index 6dfbffbc4f27..cf1afe7d1d51 100644
--- a/dev-libs/glib/glib-2.74.1-r1.ebuild
+++ b/dev-libs/glib/glib-2.74.1-r1.ebuild
@@ -68,7 +68,6 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.74.0-crash-gparamspec.patch
 	"${FILESDIR}"/${P}-gnome-keyring-cpu.patch
 )
 
diff --git a/dev-libs/glib/glib-2.74.1.ebuild b/dev-libs/glib/glib-2.74.1.ebuild
deleted file mode 100644
index de789c752115..000000000000
--- a/dev-libs/glib/glib-2.74.1.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded
-# within ELF binaries on that platform anyway and inspecting ELF binaries from
-# other platforms is not that useful so exclude the dependency in this case.
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	elf? ( virtual/libelf:0= )
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.33
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.74.0-crash-gparamspec.patch
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	default
-	gnome2_environment_reset
-	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DG_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
-	fi
-
-	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
-	#if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
-		#case ${CHOST} in
-		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		#*)            export glib_cv_stack_grows=no ;;
-		#esac
-	#fi
-
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_feature selinux)
-		$(meson_use xattr)
-		-Dlibmount=enabled # only used if host_system == 'linux'
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		$(meson_feature sysprof)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=disabled
-		$(meson_native_use_feature elf libelf)
-		-Dmultiarch=false
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	export TZ=UTC
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# https://bugs.gentoo.org/839807
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict /usr/b
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "2.63.6"; then
-			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
-			ewarn "to restart your session for \"Open With\" dialogs to work."
-		fi
-	done
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/glib/glib-2.74.2.ebuild b/dev-libs/glib/glib-2.74.2.ebuild
index de789c752115..c62ece284c75 100644
--- a/dev-libs/glib/glib-2.74.2.ebuild
+++ b/dev-libs/glib/glib-2.74.2.ebuild
@@ -68,7 +68,7 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.74.0-crash-gparamspec.patch
+	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
 )
 
 pkg_setup() {
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index fbc786d250b7..3d12bd1fcd62 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/yojson/Manifest b/dev-ml/yojson/Manifest
index c9f696eaf2da..d8ef1dfe7db2 100644
--- a/dev-ml/yojson/Manifest
+++ b/dev-ml/yojson/Manifest
@@ -1,8 +1,6 @@
 AUX yojson-2.0.2-dune-seq.patch 176 BLAKE2B 83eec30981c810286535e51e8f056de44f112ece17047dca36d32c47fd745eb3b0295337f366d4209129f9305723f3e902c6ef1634c52f51a2db2cdbb25aa46b SHA512 c90c4e2c97333b6a5a4a194310d74881fc04e5341c12939ff69f95ade80704591fcf62f85153a57d0c0127f2823fc6db9ddb12a854785492376cb70365379baf
 DIST yojson-1.7.0.tar.gz 29704 BLAKE2B edbd7f66d69a85880fc8ee9bb25a993744a310887024f7af63665ba8f5067f1b9383ec4d6dd5f4ca3376d698665a8f605c078f7597ddd4e71857c1a20143c2e5 SHA512 25eedb64e4bf7c7e8d5a5a115812cd502540afbdeb7c947da3a14e5968aa0a7db8ab402425662571d8935b9cd6a19796ce81dd80a65dc614f156626c60e7036e
-DIST yojson-2.0.0.tar.gz 44446 BLAKE2B 3b221a016ba418cc6a413921f0d7f2bc239b9a84953bbe9bec2601b159442f3e8bebdf48447367660fec3b3929ea0c08453778e491ce17f9044f505e49d587a6 SHA512 9196e117bb712b970351d12a8d7eae345eef2c92e70e627b58bb95ee49cd58e8a51e6eb5746e2468c15133d53a448ccd229a0568227de0cc8d2eed8b1985609b
 DIST yojson-2.0.2.tar.gz 46731 BLAKE2B adca246c055efe04b63e694b7735fc81a714ae3b3ab164152797cc1eff1e483976b80ff31d0ac90f9d4ac234304ec805abb118bb231d0479bc738ddeb56a236c SHA512 61e8084d66d62d05a7802ee82a414807a76959ce6e0b14fd01f1c9c71ea69976d8a2cf3d5718e4059da4161786136a08624cd8470693ef2893b862efa7d6ffd2
 EBUILD yojson-1.7.0.ebuild 768 BLAKE2B 2cc607961f2f28807c7f21b4321302cc6815c9a7a1a30074544d7c86bca5a8fc42fdd27df3b0485a382c7ae546e8c4cc14f263c3f884f1c78abb57e280b50e6e SHA512 1fcc4b8b8e577162626d0665a0be6dfc7ec622d7e4d9cb7ee80f468728941da6313575b346aab2f0e37257c5cf9b4733ab438250bc053bf52ed856689cd60f5b
-EBUILD yojson-2.0.0.ebuild 823 BLAKE2B b97fc62e1695f573c13ba4a3e40f3dd4e6a18d2a2e2de95727e1e0190b5c58a08b2e629e378bc8243fa08aa7cbc1607b8e3450fb0fda2a1f9c1ae8144a400771 SHA512 d9187abc288ee0a96dfa286240c845686d5886b25c4b7e62444b4e32622c843342077c84fa4ceb275f4692504af7f6bf1fc8e45c2d962621f17291d0b7fb762d
 EBUILD yojson-2.0.2-r3.ebuild 857 BLAKE2B 41cdf27f50841eb0427d7f1dbfb3c3b5dbe5cbb6092191d3d211d8ab977ea6c81f934c8ec1ff11fffde51c387c5634b7a614cb896e64e4100d4483b1d836a333 SHA512 db4fa2dd08eec9b1c3103816c71a8964f71f68d65a912b2dfeb2bd30d84d46d09011ff94caa73e572cbce79bff88f7283cc4d5e9601d02dead2fc4ab94255366
 MISC metadata.xml 529 BLAKE2B 4cfc5392ca4b4402f01251818c776c63d607c2e1b8d216930db594ffe2e1146ac52f9492823e5ef97ba7b6f89b2ee8eaf367e785120ca5fcabdb36549ffb6ebd SHA512 7c415ac7330d8d3397911ddd213da9a6cd5dfe76fa2530ab22cbd70cd8f411fbfdb9d40aa8ca66dc202227799fe0b8ff81c81e57815f5e206c7f424b6218baf1
diff --git a/dev-ml/yojson/yojson-2.0.0.ebuild b/dev-ml/yojson/yojson-2.0.0.ebuild
deleted file mode 100644
index 23350f1a6c06..000000000000
--- a/dev-ml/yojson/yojson-2.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="JSON parsing and pretty-printing library for OCaml"
-HOMEPAGE="https://github.com/ocaml-community/yojson"
-SRC_URI="https://github.com/ocaml-community/yojson/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="examples +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02.3:=[ocamlopt?]
-	>=dev-ml/seq-0.2.2:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/cppo-1.6.1
-	test? ( dev-ml/alcotest )"
-
-src_prepare() {
-	default
-	# let's not build this
-	rm bench/dune yojson-bench.opam || die
-}
-
-src_install() {
-	dune_src_install
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 44ef0a02deb8..361103c09bba 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 374fa84ecc62..29621bfc8948 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -2,5 +2,5 @@ AUX httpx-0.23.0-cgi.patch 2002 BLAKE2B 3f7c7e2a85d812d1a6cbd96a21b5d9716581b595
 DIST httpx-0.23.0.gh.tar.gz 2160686 BLAKE2B 036c66b2c3f743cd069716297f331f0d75043a98180b9db3e156c5692ae8bf9c68d1db87169953a7f44aaf7ee8554d0166f70b508f77b7ff4b0ebc0500bc02ad SHA512 3cfdf2b3b2f15967a1eec0be05ed947c5e18a46576b68a9cbfd5147dfd4736cb7c389f5431732b93f3a11f3ec6c6f25f7cbb3d96d845f00b58e2b8dae047c1d5
 DIST httpx-0.23.1.gh.tar.gz 2161798 BLAKE2B ee01771377bbfebbc4a9346280c8d59508c78295e61b6f9d60a07099e44dfb0fc208d37b68f511bbbacb48438cf6daa73ef82d7a7ae75470409c8346ddad0ad5 SHA512 3fe280b6d3cb1a12bdd502e7bd432588375f9cebfcd9e071acb6e851866a56d84a715428599a297f5df43d73997b2a0c02ba1a12b3e32d292b2051161a350751
 EBUILD httpx-0.23.0-r1.ebuild 2240 BLAKE2B 008a5e77c120facb896e0d0249d07cd98ece5e03b27df435d6f85f510e699d592d19386a6aaf848b5fb7f9b3108fd8a59dea4e8cb914ed9604f7d93254502f69 SHA512 2d7190ff15fb361f7200f09bcabe8fa223b0cd40bfb27a3b19ff43eee2c0fc22a2b7f9ed36819c0f404d5d10fb75c3ba534188ba4d721b0240d78665d1a66766
-EBUILD httpx-0.23.1.ebuild 2127 BLAKE2B df12b5c1cde35a3059e461db0ad509226f599e501e5e47855e0828a608b6e07343f5329a9f7fd70e34a1afadf454b2b6625dfbb38fc8e249722c539bccad91c7 SHA512 f1d177cedfb773056fa9acd15b9b84c2234d1e2afaf1d2941e3558a00911995f277f0a02d56580dee05fd09274674771f8ca8b88940f6894af637fa162ebb598
+EBUILD httpx-0.23.1-r1.ebuild 2178 BLAKE2B 08ffbb1627836d78872b5717c88f063a56ba2155c0107967a91bf145d27e25ed81e84c8b7cc379521e873ce82b1cc9b3ac5fddfbdce23c7a7cc4f27f1cb6a72e SHA512 8bd2e7dda0011ba5108c1b30bad511ba66d5784e062ccdae5d1e3841d83f7d5423b3a22522e062e90f8755a2e11917cc1b7494baa66fcaa4c65d6dd62e64f7eb
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/httpx-0.23.1.ebuild b/dev-python/httpx/httpx-0.23.1-r1.ebuild
index 5ffaaf198d4e..94aea019b8e3 100644
--- a/dev-python/httpx/httpx-0.23.1.ebuild
+++ b/dev-python/httpx/httpx-0.23.1-r1.ebuild
@@ -56,8 +56,9 @@ distutils_enable_tests pytest
 
 src_prepare() {
 	if ! use cli; then
-		sed -i -e '/console_scripts/d' setup.py || die
+		sed -i -e '/^httpx =/d' pyproject.toml || die
 	fi
+	sed -i -e '/rfc3986/s:,<2::' pyproject.toml || die
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/python-ctags/Manifest b/dev-python/python-ctags/Manifest
index 3c30d1bfdd0d..897175736f53 100644
--- a/dev-python/python-ctags/Manifest
+++ b/dev-python/python-ctags/Manifest
@@ -1,3 +1,5 @@
+DIST python-ctags-1.5.0.gh.tar.gz 63921 BLAKE2B 1d25e7bafbdf157f1051321058b39fc9347bc479a61fae637bd11ef8540a3c67e2abd101493668977f05e464a8203b8c518fd1f4433defe5cec9939a200438b2 SHA512 414774c865af51e54c53f66dc7b3cfb5a03b64ea4eb94325658c158542615dfffdd1a5933d9ae03cedf1dbac30e1810d5914fbc3d6ab41e5f708c5d3000d161e
 DIST python-ctags3-1.5.0.tar.gz 59091 BLAKE2B 303b061e7e660c1ed08c52fa76e4a96e288c6359167006a112de2262eff8c6bb564cb5c5ed310e091a3e88c5d5494e883020e7aa3ed900dc9a316cc8a9f597e8 SHA512 a5f1e2ff49abf9cf471a0139c1d2e1c4f836557386f394a96e67692d6153c60717df16fc7dbf832f69182270842fdc550f77194855111534c3b71b81ac94e483
+EBUILD python-ctags-1.5.0-r1.ebuild 1043 BLAKE2B 1239be119a6ecc09e886513810d6f3220f098aec3e0b3afd58b45d60c87e5817a785c5505efb0fb796e542adfb6ee1ad87db6898c46b9b7d8c0b04ba220cac79 SHA512 7b41c8178263f97a6aeaef3dbe3da357c08bb81b858cb4d38600e2e12f923c3a49c08d622fe8c32965999f059c89a4b5b55d40866879104acbeb37e663aa0df4
 EBUILD python-ctags-1.5.0.ebuild 515 BLAKE2B 9e5feaefddadddd79f8aab4a24a6da06c10f53f186493f12bc7a1610e6acb644f4266abce26230a7fd5b4d9839fe37af0e88c8e24b8351e0efdddee85396fafc SHA512 44d4c078917582d34db0500ac4fdb69443de8055437c2f7ce9f3cabe7727f5cbba9a7c2a7cb42065ee3b5827e697241ddace66db292ec8a9036dc22cb7e91058
 MISC metadata.xml 468 BLAKE2B 7a89bc7a950e780ed4093c77ba31c18dd0e92e6e661c20012e0c97e1e00176c9116b830b1f80359a71ab51b6e22614b820d27b449dd7c16f884d85f1adbe83ad SHA512 39956be9e9e61a5fbc02340d5fadd1044784fe73d39523b500bc74e4943d57f6581bfdc366f763eeaf5851cd5d34e348856d3c92450ca6c31691eb9f36c56154
diff --git a/dev-python/python-ctags/python-ctags-1.5.0-r1.ebuild b/dev-python/python-ctags/python-ctags-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..12154624c3b7
--- /dev/null
+++ b/dev-python/python-ctags/python-ctags-1.5.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+MY_PN="${PN}3"
+DESCRIPTION="Exuberant Ctags indexing python bindings"
+HOMEPAGE="https://github.com/universal-ctags/python-ctags3"
+# PyPI tarballs don't contain pyx files
+SRC_URI="https://github.com/universal-ctags/python-ctags3/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-util/ctags:="
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# We currently need to let Cython regenerate this file to make Python 3.11
+	# support work
+	rm src/_readtags.c || die
+	cython -3 src/_readtags.pyx || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# To prevent pytest from importing it and failing with:
+	# ModuleNotFoundError: No module named 'ctags._readtags'
+	rm -rf src/ctags || die
+	epytest
+}
diff --git a/dev-python/rustworkx/Manifest b/dev-python/rustworkx/Manifest
index aca95dbb5783..80ccb8b7ef2b 100644
--- a/dev-python/rustworkx/Manifest
+++ b/dev-python/rustworkx/Manifest
@@ -29,6 +29,7 @@ DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d321
 DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
 DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
 DIST numpy-0.16.2.crate 51574 BLAKE2B 37ae5a83a1bdaa79595be2004969f0d511d244e58ae39d7d481fc8f6289d9c3f711ca3765ae61b0e9c7ab8e5eea67f426494bfd6474d28b4b6f3c29465c7ee45 SHA512 34f1230fe9ee120642c5a8480077cad9ea004ede34096719546bc368e298c7a0c578eef801a622dec7983119465e90970b3e46ec882787721226d10c43f58428
+DIST numpy-0.17.2.crate 66754 BLAKE2B 5ac3de861fa36e0d27eb117faf2be1e9a872fd507ad847d8fe193f56e309dfbae1fa4a1a77300ae88eecd695ba4578f4dfbe70940cedfb4f332ecf8930862b39 SHA512 b428d290ebf023676af5f7d0f2578e69f195f35213cf4b30c0ab6692428e907dd91afeaf6ced7e89ad46005f99c9653cce362684560f7208aa646243a0b67534
 DIST once_cell-1.12.0.crate 31549 BLAKE2B 72a6c2efe279abce207096dfc47d207adae34764642f742bcbddcd8ebab9f78f6c2ea7750bd670844de5f6989e4951904b5f624281c28346cb6c41c585137e91 SHA512 02da0e6eccee2d5246fff5e6323bd7eff0f4641801be5e5910763929a5e9d8b62c07f81001c405cc6aff03f68a14ed5bfebd9900bbdd09568bd1ab9ca9b73093
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
@@ -37,10 +38,15 @@ DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed
 DIST priority-queue-1.2.0.crate 32057 BLAKE2B b858eac5ca05efcd0d630b0e4ac5a4de60f9fb08a44705e681d045e1cc367b6a08a89cd4178f997f9d9aea7ea2eab6e3422c94f1ee8b951f3256fb4a42fc3394 SHA512 62c84d0f2b81243aa71a631a35cf20b905e130a54da5b29c193afab249a00933d6b63203b81747b6d2007c7b6707cb9039cdb1d356e87b2d551899b5bf3cdf2e
 DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
 DIST pyo3-0.16.6.crate 364587 BLAKE2B 935b3347770e1fba76f6aee6b4ddc41cf9cb13be77e76d2668985012776a119906403a8fe95ccd0e33b4630bd38936693d2fd1b7b3d11d84a4e53fca021a2f36 SHA512 fe297e4d171ecb5a965ce9f3a0527a086766ac5607ba7b59b2a3a8f6cc66da3959d93f1d6aa688d67ceebde41ac4adefce18c0d52c1b77d0cd95cf1178f52325
+DIST pyo3-0.17.3.crate 408939 BLAKE2B e67ce34c626dbede3c76abf66ba5078827e8a75644ff9fbd83eccf3d53096a3c2e0991da8b3489ea9984c665751308bcf4aa9c3d31dd62c72127694156a7a0a9 SHA512 5c83ea76202edce13c370d023562a9009382e36fdf3fcd7c4dea844ab8e5e048db4cc79a9c0ea98fb7017a83da16924ba0981ad98bd83e75e2fac434738e9740
 DIST pyo3-build-config-0.16.6.crate 28891 BLAKE2B 26667482bf9f5b140daab9728f58965a8417e879bfeaf27d9c61f75502150557f3d5952bf52b1d16360ade2f58ed44f99e10a5781a6d241844e9202735c6625e SHA512 a015bb4c328f0d1e643d64831e029bbd66cbf635ab616533f35aefce59abf1c5d596099feaccb81bff02e863867c14f975ce6fc55bc05d99ea47b5f6fdc2da5d
+DIST pyo3-build-config-0.17.3.crate 29230 BLAKE2B 193df0c15a2150505c823338e76f4d75e2f28158626edf332da2b10b6a81bfaf7f95a3a32c9f218717504b2f0dd80d3fb61c78ab3df9cb9024c3686f8ca002b0 SHA512 92652ffdfb3f6c3c8a1c2f97f5e2ed19175ba6bad5cd0f0c113b569369193aa18d95adc780bbdb8202d815a1ec0b6aeaf40d93d64faab42f4e8b452c806906a2
 DIST pyo3-ffi-0.16.6.crate 60756 BLAKE2B 148e67de195577a1676c80be1a5538d80cf25b0d9eac9facfdcd223dc40484a9c3c7c84377f727e83e50118fa803591acc1d800b93adf29c91e6a15154c2856c SHA512 97c69900e2b355a002d10e48883cc8d4d9245d07f956087fb9c3b0ecfb9039c84c3f3a23f17caf28c637c4522f0fe252fbbb16b543825e4f724ee19232a34d22
+DIST pyo3-ffi-0.17.3.crate 62854 BLAKE2B 3f1c519b210de0aee19b832845c1d44237f780f18173ddc1b1cef5eac1060fab40fd8dbec067a49e4d28fc7edcd0bd751f54438ad42a8b98641de0517052c64b SHA512 c08481d1530207fee544a5dde14253415e5451c1c013b86ac1f0e9bcb3c1df7866764cd11bad523105b6821725560329b89ff689b3aa2f0698cdab148d0fc12e
 DIST pyo3-macros-0.16.6.crate 8453 BLAKE2B 518809b1236149f14b264d48f642e873aea2b22edb655cf4cf4d6307d2eeb7544228b80ca7559397d3483c837ae2ea9f772a26563d01a95613dad0a1a704c1e9 SHA512 95b6898da9974ef232b04197e47ea4e7d60de9f817da9a9995f07b05ca74965df2b2e8e8267d616b665b04ab810b93ca17255b20df89ac9c71014e5c9fd3a9f1
+DIST pyo3-macros-0.17.3.crate 7257 BLAKE2B 4c5e166a37c31f2cc21b7dce9b46dcdaeea0f12299c421430efe72b47ac954f10680bf6ecb28a5f0058abaf22519f6ce05d21e5de534e362ceb9847049601f4f SHA512 f99d38ea69b1d46599d203908d12eb3fe4869a48b21b3eaba0c9c8e52b9f2b3c5ea72505dcb9b3330450dd724eeba859eef724fe9624ebbd8bd3cbcff7372df1
 DIST pyo3-macros-backend-0.16.6.crate 49252 BLAKE2B 9fc531507d4f9d0e7ed183987fbabd043f7c31afe6488c53c6100d98e75e5296e9ee7cc4eb14798967ac62e7d8c31d602eac5166699058def384e4f029a3cf0b SHA512 49d82cff8762eeb27d8220aa98b2be43f614445f156212d45abef052e347ba2f4a7930e7c5c8a9843ea895ac5c223afc6527d036a9cad00efff9bda18907b019
+DIST pyo3-macros-backend-0.17.3.crate 49992 BLAKE2B a922c3c2c1f494002fa8592704c43ddbb4d9bf650187adcfc94f82c1275bcb69d444ede404d1b40bdf1e199427e8de880464b76c7385c2f96633544ad021c4b4 SHA512 b4dbddc3ac7ae542560459376127cabdbb4de83c04d70a4efe0976fa94e6ce94a7a62723f689a8fbb1d795fc235b1ac3611f8b4985ae2af0db4a9dc08de48927
 DIST quick-xml-0.22.0.crate 132066 BLAKE2B 1c1d71fdaa022e430e6265530f3e40924c13457fe422e4355eedfcb5ebe8c75d0205f73ffea0968d8196d74804d7d0fbf61954852c98831d510af6c45dcf6923 SHA512 15e56fafc84e62b219977c5ab0f07a021bb71216d7cbb673a7ffec4ec6bda36f97d7b7034751b0b7d745df7c17c1a591a281cf2c97aa4fada7327979711ae3dd
 DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
@@ -52,11 +58,13 @@ DIST rayon-1.5.3.crate 167246 BLAKE2B bb312c9879fea3cedecb70bff78616eb7fc761e220
 DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28ba4d98e95d7ae964c32f13967b4ca160d219b53394985ff4557a11a6ab3c242333e2a6d3790801bdffef3f9153 SHA512 4b852f083766e7e414132840cc8dfef148e15db47967eeedc2ddbff9a4372521c296dd4f66e0b6990f49a8ce88ebed9d44e7ad674df42f96b99b24469b1852a5
 DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
 DIST rustworkx-0.12.0.gh.tar.gz 480968 BLAKE2B 36c1e77108d1a9b473210ed80b5970d40a5ba504e1b820dc67478a3e4aaecabb1b279744cc0fca3eda2a839e96cea696b8ea3601fc08a30e44d4a440cbf47356 SHA512 41ca3a29794acde0eb312689b0039a5b1c12fce5ff40488c55839db6e7d35e67cb225af618a020f013367dd7da1f6a840e8d6bc665f35923f9b1fe126b2a7615
+DIST rustworkx-0.12.1.gh.tar.gz 481574 BLAKE2B 7d3c574f09a8661fedc4c03637fae06361d61ce10aed4bd7d0dbeb9814f6cc7666081a9ca2497efc5f94ecd5410ec6fad4722d4f696eb5992d639c2961a5bcca SHA512 07a97e677886bf822d2f943477494c0eb6435d26885bc4190ea31eee6a49bd347af19690e96d0747cb213efb9c6591a0a9606c13558bc4e0692671380f9af223
 DIST ryu-1.0.10.crate 48485 BLAKE2B cbc0ab4e0b2031f4ca3a34914bd61395d14706d42e2414757aa23a67530d549382d61b630159c92a169d1dd3315951b0071ff18349d2b090ae262de536aa29e2 SHA512 1bd0af71a20715251dd42596df6e7677e44f712bbb40b0d9544109c1b2478a7bd2c9393535f0d4f3bfe2d1b75b3a2b899044051715a7da7d165d6d586e0775f2
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST serde-1.0.145.crate 76568 BLAKE2B 2d38e4ced18d204d8c36122ad09fc00f0378c7e9014d3bc67fb7c3e5ab0f923aeabb6a5fefc8699e80e220b12601d01dbe3ae5267a124164bee2e4d9897aa0fd SHA512 8146c39249ad54028717bcfd916fa5abd8b1ddaec54c4d0de485bf10cb6a85676a53068a07b9563e1717fedb4746ef672ae0c285a8998543cf92d7a157f2d442
 DIST serde_derive-1.0.145.crate 54860 BLAKE2B 0c80f1b8844e044bce28c3fd8e46ac732de21736622fd7b2235c41d9a909d7ad224e8e7ba5fa3e5de2cfba5e48a4116f97e9b7eb31b0201c01bc98d40a78d16d SHA512 267389f8cd6d3a7b7d4a4d3226346999294e2fbef7446ff1cd1183dfb4fd17409f5891f6c2cae113b79cffdaca07f2037fd2f4108f93723e6baa5153bb9a61c6
 DIST serde_json-1.0.85.crate 144635 BLAKE2B 03d2de5563c8b8e9150b656b62329a87a5dc42c1fe389e40291a3b2a7232e2342b6e52f6625ecfaa8cde4420017a0db82b2ef332f82f2fc1caa50b98e544031b SHA512 b9ba5c8f5e5c977d31c720995317c99486897a064993784e8abd4e35e0c9ccf20d421552b4436cd88420b5e6fe1d7ebc411bbc2e803cf1732e133c29365834bc
+DIST serde_json-1.0.89.crate 144638 BLAKE2B e296fd2fd3054b81349f246d207de4f7f8072e480a34f1c39afc2d46cdb6b861d1514a8bb64f2f68920e8db43b642814f7f4e989dab95cee62485ca2f8db2e8d SHA512 4bafa5693977e129f5787f2ff10f914e2a7740bf7e631bcdf51b27d0d9e5517873184b56649914371e1881107e7ed0a8fedf487617db334d4a7a4bf95c6c16a3
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST syn-1.0.96.crate 236896 BLAKE2B 57445f4925169212c3b794312f388c2829bc343fd60f37f60d46bc944c946c02476b1ec64f17ec8b91e84c112dbbf04bf64feba9a3fd3512dad0d4b3376f4869 SHA512 f53b9e97b6b19d18a35d13aaa9c58b8fdd0da96443aaad76ed027e9ac7d438b574ae052b02b9bef410f25fbab851a5af3cc64fafaefffe47932827e6ca02209c
 DIST target-lexicon-0.12.4.crate 23020 BLAKE2B ad9780b9478b00b4fdcb07bd016d83216695413090ac29cca06388c3790e2832c978b1c7e69f6d34bb6fc9adc39c0a0b6b6636e50a9715a9f5f16445dba22d19 SHA512 194fe1946ad8d9fdb383bf8a65374e24d216382c1ed5379dabc98d58842512624c32838b8d6d0658d866f6559d37f1343a30c5809e8914dd85790399252b3e06
@@ -68,4 +76,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD rustworkx-0.12.0.ebuild 2646 BLAKE2B ce1a7fc1c850860dd526d03b4af63b3b95cc7b49758a30f4e00c3624b7b5bdc0b763d3e390ccfa23168933eeeb79f2ed101fa05c33b1a5c2c5a1c46dc1364bab SHA512 72bf62ab9ebd898e4ad3116010ac2696fe1078668f052e67286945cb3a8e4ba09db6c572037a6ea622b80c55cd29509121613ede90ad4f9f82fa5b5a385e095d
+EBUILD rustworkx-0.12.1.ebuild 2707 BLAKE2B c64d9a58e3e285ab39ede615b128ee8e71a17e89caf4058837195597583da9f1f6454f2b60fdcd7a0a2ce2e54e4c7741b891e513b7a9740a4bc6747f569aa341 SHA512 b273f373473b9000a53aa7418c3fc8bbdbfe1c5a05244e544d8346c8bbf9f32ad5c39c0889b49831f1e41ebbb8360412e3e51c707dbc1c70fd451ddd39372b84
 MISC metadata.xml 1286 BLAKE2B 8f121e669008927c921d7425b45ee5f103eaa6fdfdeafa9e6f96de67cad37bd28894411b68f25b8928b043774f17629b855beb4228aa4f1461394089b67510a9 SHA512 b95fe484c2e21621003f1ee70636b75eda8f941f94cb5549750cfb9234067c1e79d5dc9c85b08c8965578360fcb85d6cf726c3787cc66e3d56c0f0f9e45ac867
diff --git a/dev-python/rustworkx/rustworkx-0.12.1.ebuild b/dev-python/rustworkx/rustworkx-0.12.1.ebuild
new file mode 100644
index 000000000000..0a3ad52b10b3
--- /dev/null
+++ b/dev-python/rustworkx/rustworkx-0.12.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	ahash-0.7.6
+	autocfg-1.1.0
+	bitflags-1.3.2
+	cfg-if-1.0.0
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	either-1.6.1
+	fixedbitset-0.4.2
+	getrandom-0.2.6
+	hashbrown-0.11.2
+	hermit-abi-0.1.19
+	indexmap-1.7.0
+	indoc-1.0.6
+	instant-0.1.12
+	itoa-1.0.2
+	lazy_static-1.4.0
+	libc-0.2.126
+	lock_api-0.4.7
+	matrixmultiply-0.2.4
+	memchr-2.5.0
+	memoffset-0.6.5
+	ndarray-0.13.1
+	num-bigint-0.4.3
+	num-complex-0.2.4
+	num-complex-0.4.1
+	num-integer-0.1.45
+	num-traits-0.2.15
+	num_cpus-1.13.1
+	numpy-0.17.2
+	once_cell-1.12.0
+	parking_lot-0.11.2
+	parking_lot_core-0.8.5
+	petgraph-0.6.2
+	ppv-lite86-0.2.16
+	priority-queue-1.2.0
+	proc-macro2-1.0.39
+	pyo3-0.17.3
+	pyo3-build-config-0.17.3
+	pyo3-ffi-0.17.3
+	pyo3-macros-0.17.3
+	pyo3-macros-backend-0.17.3
+	quick-xml-0.22.0
+	quote-1.0.18
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	rand_pcg-0.3.1
+	rawpointer-0.2.1
+	rayon-1.5.3
+	rayon-core-1.9.3
+	redox_syscall-0.2.13
+	ryu-1.0.10
+	scopeguard-1.1.0
+	serde-1.0.145
+	serde_derive-1.0.145
+	serde_json-1.0.89
+	smallvec-1.8.0
+	syn-1.0.96
+	target-lexicon-0.12.4
+	unicode-ident-1.0.0
+	unindent-0.1.9
+	version_check-0.9.4
+	wasi-0.10.2+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cargo distutils-r1
+
+DESCRIPTION="A high performance Python graph library implemented in Rust"
+HOMEPAGE="
+	https://github.com/Qiskit/rustworkx/
+	https://pypi.org/project/rustworkx/
+"
+SRC_URI="
+	https://github.com/Qiskit/rustworkx/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	$(cargo_crate_uris)
+"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD MIT
+	|| ( LGPL-3 MPL-2.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/numpy-1.16.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/graphviz[${PYTHON_USEDEP}]
+		>=dev-python/networkx-2.5[${PYTHON_USEDEP}]
+		dev-python/stestr[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.5.0[${PYTHON_USEDEP}]
+		media-gfx/graphviz[gts]
+	)
+"
+
+# Libraries built with rust do not use CFLAGS and LDFLAGS.
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rustworkx/rustworkx.*\\.so"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_DESELECT=(
+		# TODO: hangs
+		tests/retworkx_backwards_compat/visualization/test_mpl.py
+		tests/rustworkx_tests/visualization/test_mpl.py
+	)
+	rm -rf rustworkx || die
+	epytest
+}
diff --git a/dev-python/trio/Manifest b/dev-python/trio/Manifest
index eda1cf2df688..1f0919b96d34 100644
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -1,5 +1,5 @@
 DIST trio-0.21.0.gh.tar.gz 491228 BLAKE2B e5f65d3aa9e4bc0c449e3986048d63fe3001a2eee96dbe5d8c088e0fce786b1d50861b47170baa7cced097938b16c92f0efd51518404a5e0ea6a17a48d656823 SHA512 383b11f264ddf4c78eb75829472826ebacf32d063790e8d4681d5df2f21c4f9287884db1752fd19976b674643adf7299816d4404e3032193ef90f522ad9cfa79
 DIST trio-0.22.0.gh.tar.gz 517482 BLAKE2B ab1fcb22d8f0ed9c8de831a9384b55ab433811863974cb767cb0ea4eb3a0df7372b5ea2c2d4c2af3ca1d3c8c3144d5546ad8cc68276b17ecb3d20ea1858ba9e0 SHA512 45b813d6cc65f8d49f70cb0ea7f33593fed0cc5989c60ba449f0b38c4759604aa7360cd016758fd364438b92516be549edf1efd583c7f5ee2de8813334f182bc
 EBUILD trio-0.21.0.ebuild 1724 BLAKE2B 651e4ad9b87c9a2b78e12d4a2d416b385798ae0af9a1c062e53b8c28f591ac196d409567c0fec158cc88b67b2c54f3709f89094e6d2e3590092d149aaaab8305 SHA512 80763d92c47b1912149b7bf79404875a5be03c1c542a4d5dbfc11c0330799ff34f313f40fb550c50584b4d1309fea020d12c5edbd5f2fe97078ebe5008022f3d
-EBUILD trio-0.22.0.ebuild 1803 BLAKE2B 8fe44f49bcdb86066be3f782462dd7929059c8a73ed881fba89adf3cc158c89f58d3c0f0d6c89d6f4613a328fe8b530a12f55ec7eac953e35184d345d0b74a77 SHA512 2c70a415ddcbe443c069260eb974eba311051c6e704395b04694d8512a57f1319551af2d7d367bcd5c279ea4be2c696b76ad95c9beaf3d7c0420cd655eb7f088
+EBUILD trio-0.22.0-r1.ebuild 1981 BLAKE2B 662cba7ba0f5bdf845fd00a8ee91255161626c780ce1a81454fbcb451674b0ba7b5bd72bd75652f6dcfc25bcaea72c426b68c4ab4f9d9a8b9b1df8655e4bd88d SHA512 fc01fd455cb4872fe00fb57d8f357eaa965fc1aa18612412a256cb204bcc2b6d6794a5df890530198e65ce1323cacea3a71091ca11a1d63251bf6a8310124b38
 MISC metadata.xml 2060 BLAKE2B bb6ddfddfb3c19038e5982227a8c5f9999b93868c343a9a5bf7af5963006b5b719ef960f65b91747dfddf19544134db9e1a2d65e94192c079c64c303cdc8997a SHA512 4b86e7cccddc200d5616550e309ad46587f900ed13c38196e874e5110974b856d65e18745b8b7b42858cb672940ba280b0c2ea54d33f9b5bf32a375fa1232088
diff --git a/dev-python/trio/trio-0.22.0.ebuild b/dev-python/trio/trio-0.22.0-r1.ebuild
index 88fa5db8d5e3..08ba007b088a 100644
--- a/dev-python/trio/trio-0.22.0.ebuild
+++ b/dev-python/trio/trio-0.22.0-r1.ebuild
@@ -47,6 +47,13 @@ distutils_enable_sphinx docs/source \
 	dev-python/sphinx_rtd_theme \
 	dev-python/towncrier
 
+src_prepare() {
+	# fix incorrect version
+	# https://github.com/python-trio/trio/issues/2485
+	sed -i -e "s:0.21.0+dev:${PV}:" trio/_version.py || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	local EPYTEST_IGNORE=(
 		# these tests require internet access
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index ffb3718bac3e..355329284c6a 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 49dda5072957..7cda1ecdde7d 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -2,8 +2,10 @@ DIST pkg-config-1.4.1.gem 22016 BLAKE2B efac610221b288bb669a3783c0e70af395147814
 DIST pkg-config-1.4.6.gem 22528 BLAKE2B 7d040576e0d035af75218e7efee6d3a8ee27206de8e12ef112c6fa7c5917f300c07149c08d510f26f89299cb73c384775403ff7f863379c195fb524c8127c59a SHA512 328fbc46bb549d4cbcd4995cb91545bd13f00f3d24610f9a70b39ea3b58c595d96801fcfe9ca9848d6664d7c9dfce44ce2702a58b894b80744619678e10b0e50
 DIST pkg-config-1.4.7.gem 22528 BLAKE2B 450dffb0c9680f92c8841bcc8c7aa2e187f73e8db1d1325ece7dd024ae0f430b8365d185742d349775bf821210ecd13dddf5b9e40bc85ede07cdaef3199b23b3 SHA512 ca93bcee16b75690af630236e6ab01c13de220f1ea128475ded5fac155f12a967ceebe9b5ab3e7e6f43d5dbf81ccb1bd79f6f25c92eabd3318019b0e50696623
 DIST pkg-config-1.4.9.gem 22528 BLAKE2B 5b033292b56fd6cd163b611d3d16becb1489691ad348124234495333906eb19d92c994068a32416360248b641769f1da0aae777bf7372119d04ab9164cdd7b32 SHA512 b2052be243a6f9c9a96f76651f76460bbfd9d99fe5d1fa00f47683c659f2971ade525f5da5df49e214972f3cb1226d3212e134d44f1a3fcd5e0a8d253b281194
+DIST pkg-config-1.5.1.gem 23040 BLAKE2B c814cabb2a57f9a40cd5b8112f0103a9aa7a4aeb10f2991ff23a846a98714d832c77ecb9bec9b3c884adf98496eb552451a6b98875a78921efdac229fc5a5e39 SHA512 972fdc1ed64adb66a388331e10c00648560abec8455727b804cb2fe9ce40dd9801dfc909116c1cc96b8617aa52873339a290c5d0775a88c30f2399566db557e6
 EBUILD pkg-config-1.4.1.ebuild 782 BLAKE2B e2ba8b0981bfbd85b1451a912d0589fdf518612514dc58805bbfe9a446bb7a34ef45d8ef0d2b86dd1f67526d938ca526d9c1e88aaf6cf0785de6a0987585dbd2 SHA512 4ca32118847ce4c0d63218f323c53d1a2d86bc10caeacbfd623cb77ed22afbac7bc1dae47269858eb08a1c1cd2c248057fd6a12705c9d657ccb1a0b237196880
 EBUILD pkg-config-1.4.6.ebuild 650 BLAKE2B 23492383e7f855c67740272c551d0925490a97437747b0f5a2f7802fa57f3fe504eebc03462a1db279d011bc5a06980b1ee09e23f0fc099d8e715b34159ac4bc SHA512 48e3d83a5c7485bd8829bf47f9817b7630f3db6645a6ac9682a1563b94e921adfd51d7b485915e570d33d9c19df5d2f00bd334adfbf7b83085b4688274f4d73e
 EBUILD pkg-config-1.4.7.ebuild 763 BLAKE2B 77b671f006ce1e971e4b5a9ca14b83298c4839734f4e1673934090c825c5e61d4eda1d0bf9d04fc2dd47350cb82a41da8cef6692db31f1e6ca9e074fc4e76de3 SHA512 1b74e2e6ab0a58384e3eb99a911f85d5ff37273014ebec6406e4c81e7e524736231f6d16bc561df98b696c53f3b58eb172374da53dd9b585432f5a030d6973bf
-EBUILD pkg-config-1.4.9.ebuild 756 BLAKE2B e117cbd1e881c9ee69275acced056e0ab744940f4c24bfc52e03f7d2e934357a63f02fc3a410a7ec0fedc7829f3973c44eb61dceb5c1595c002efd10ee0dd8e2 SHA512 cd1000f305a43627876a5c808186e0d2b5bf470edba647b57322b87225d6f1c2e1162486069e958865dbea3c5632ab8f2c5605ff92a29efdf0d7aa4aaebc6ff2
+EBUILD pkg-config-1.4.9.ebuild 751 BLAKE2B 40b74f071d00ee97b0590efa94f81bf2a1fd66b7fb8e1890345ebc2e5d2a3c71d828421305d8326750184302be8ba6b9ff6e739e4382068c2058a0d752433211 SHA512 c835ba2cbebb58853515a56673022530e1593b6e07d40670bbb696f32d9e1b4a56d536c7fd09ec0c4ada3cdc6009b27e8bc939ba63bc3f94d699ded33e5ba5a8
+EBUILD pkg-config-1.5.1.ebuild 756 BLAKE2B e117cbd1e881c9ee69275acced056e0ab744940f4c24bfc52e03f7d2e934357a63f02fc3a410a7ec0fedc7829f3973c44eb61dceb5c1595c002efd10ee0dd8e2 SHA512 cd1000f305a43627876a5c808186e0d2b5bf470edba647b57322b87225d6f1c2e1162486069e958865dbea3c5632ab8f2c5605ff92a29efdf0d7aa4aaebc6ff2
 MISC metadata.xml 455 BLAKE2B 4a60efb90428ea8fecafec935f1a51c9702ccef29f3f534b777d9425a1a1efc8933937d4725b079e662baf0b9a4f3087710625347aff8561d8fc9a44820e28b0 SHA512 d57b118083a5b11acd3de88461446a56792f6d8243a994dd1808c1039f017f6392a2d837f8baa5c124888a72256821d2319bd6cc8bf0e01fa6b7b4866f350eb4
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.9.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.9.ebuild
index d8aebeb67680..e766c86d86b1 100644
--- a/dev-ruby/pkg-config/pkg-config-1.4.9.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.4.9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A pkg-config implementation by Ruby"
 HOMEPAGE="https://github.com/rcairo/pkg-config"
 LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc ~x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/pkg-config/pkg-config-1.5.1.ebuild b/dev-ruby/pkg-config/pkg-config-1.5.1.ebuild
new file mode 100644
index 000000000000..d8aebeb67680
--- /dev/null
+++ b/dev-ruby/pkg-config/pkg-config-1.5.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pkg-config implementation by Ruby"
+HOMEPAGE="https://github.com/rcairo/pkg-config"
+LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+# this is used for testing
+DEPEND+=" test? ( x11-libs/cairo )"
+
+all_ruby_prepare() {
+	sed -e '/test_cflags/aomit "Fragile on Gentoo"' -i test/test-pkg-config.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test-pkg-config.rb || die
+}
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index f51ab455c26e..d668470de5d9 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -1,7 +1,9 @@
 DIST rbs-1.5.1.tar.gz 672987 BLAKE2B acdaa88627ab79626cb391f5c7dd040da648c9c0cd2e7a7ed697075436d6215edd444dea6079c0319051b326e8823d8151376193f7aa34ab10b533560ecd5987 SHA512 2104eb5ae023fec317ed5cb498a283ac8d3831360822f8917d89ea522a3e5f3479da7d4c57e878a6be6064debd7f3818e1367d4b12f0cd487d7b019f80096d9e
 DIST rbs-2.3.2.tar.gz 977459 BLAKE2B d33984c03a962f4d72989b5b665e7e256f8928e86fa15162a8df549259a832b7898da62c949ae5bb06ed3da82d3179c3e350a392e6177d15a26600debea82539 SHA512 1ae9318265f47232bac77ca966fbf7c2b1b7a1eb3c1070258812f697c633026527c411d2e2319f3c16a3318307cf1cd0983967ba0cf2cae1f9f37a607b6aa92e
 DIST rbs-2.5.1.tar.gz 983686 BLAKE2B d0feb4f173e2d1dd76d93309279fc75f9ed992ead2c144d69905e6acd139c709535ae29d78e85787f082821734a6448446e746791922e4322c55dc446a38ec06 SHA512 079778ad36db8f096e33d04a460b03d03c6b3616a2066e40a3aa06615d51265d8bfa7669a31463ce46bbcb16dc74ed8a24ba280b46c24f25b2327f5c8a8ae891
+DIST rbs-2.8.0.tar.gz 1065757 BLAKE2B 136ba929d0b61c6b2625b49574ec45a28aa1de77a1a63d74bf5747ff4c88968ce28116472a97310e10846dec404dc2a4ccebb51c90f14f5713f3b1d21f18c9c6 SHA512 3a04026112bffef03a3e65c5d539ead7de353b4af279da6f4a7def854fe6c7f95d291663ab18bab678228ae4b26e87aec89fc1ed961ebc4cf83f38ef726ad407
 EBUILD rbs-1.5.1.ebuild 1188 BLAKE2B 9c309c9befa8e76e809c4aae1dc2f2e574293bc1ad273eafca746328fa185f25d4c566ec590e634422f9d7617fa9a28af622f790e2c8e6cada2f75891de75a09 SHA512 3a896d5c0a9723c5009a9271d7125f052660a52a2ba450721133d7546b3c00d8f5697d28191c6bc4aa4db1558f09f5593972d7ec663d6b44d5235021c1f70248
 EBUILD rbs-2.3.2.ebuild 1868 BLAKE2B b0b276a68cffceb3e6dbd12a5205043b155af78e945c1b191633a29415e39b650735cf46147ce777a9660e271580e3ff4afefbe92e99091908be00845566bbb1 SHA512 012929a95f0a0843d3037a4a696606686d9aac630b99e10dfee6ab283a71534ce0089c3bf9fe44565a1a21336b3d64b39b7584beef283c4dcdc62eeaf6776dc9
 EBUILD rbs-2.5.1.ebuild 1868 BLAKE2B b0b276a68cffceb3e6dbd12a5205043b155af78e945c1b191633a29415e39b650735cf46147ce777a9660e271580e3ff4afefbe92e99091908be00845566bbb1 SHA512 012929a95f0a0843d3037a4a696606686d9aac630b99e10dfee6ab283a71534ce0089c3bf9fe44565a1a21336b3d64b39b7584beef283c4dcdc62eeaf6776dc9
+EBUILD rbs-2.8.0.ebuild 1861 BLAKE2B 7e995b170de4994e2bb27c89b03e327537f8883526e2eb6cb92d5b8a35bb1ec97188236dbad8b049052c8562e9d73e8f776ade376dd89cc6217e9dd4e58076f7 SHA512 0eded9f361eed7af5d57f06cc6d712c9438fc58e1f6e1d373048f32ce8b477667b927d17555d741bfe5856a9bb2f80c759af91fc1f1b93757def1fe6bfac2dff
 MISC metadata.xml 335 BLAKE2B 287ad52f77f7c62c6fa58fcdb9b1c1498cf39010ab26b6f98655beef9719ee5803844b1ab084788af70087e342a02806a8619a8dee472bf6d4d0b2ea54d2152f SHA512 75703ccbe3a15813f6fd3fca2489a9b39e586f59ff2cd89ec8d7a6293760a8789aed715565520f0f623746932bd756820eef960e45fea5f130d34cf4cd586cb5
diff --git a/dev-ruby/rbs/rbs-2.8.0.ebuild b/dev-ruby/rbs/rbs-2.8.0.ebuild
new file mode 100644
index 000000000000..2186f7290d82
--- /dev/null
+++ b/dev-ruby/rbs/rbs-2.8.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# We compile the extension directly
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	# Avoid setup tests since they require a lot of development dependencies.
+	rm -f test/rbs/test/runtime_test_test.rb || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb test/rbs/collection/config_test.rb || die
+	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
+	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
+
+	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index b28ace0de77b..1e3ce09eb1b1 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -1,5 +1,7 @@
 DIST cairo-1.16.6.gem 197120 BLAKE2B d5c1f1704592afb096d30504f2d74d27e29e6222fd1648895beab786efae071de70f942b31e2f49960ec91bd87f0297a2d3b07013e894951d4ec1e8d376e73dc SHA512 f499daa83e865d58cc29d158ce649cab9f939464a08e5d7711f6cf255fb8dcfbf52457e3d2b81aef2018ad8d0762117776049b3681c9be6abdf4f0b12e43404c
 DIST cairo-1.17.5.gem 197120 BLAKE2B 6788c4832331407802d56dc429d665d8a82d9e69a7bf9958391b02003e71d7449cabd65fb97916e8e06a16fa599bae1c514e8ace75304f746db3051bb6bc21ee SHA512 f2ade6fb6b9fccd81a11061b277d4a9077936e0beef42c61225bd4d5630586a57a3fa192a20a0f7e4922313e2a8215268bc9a5d007d2805cf1f80714fd9ad1ba
+DIST cairo-1.17.8.gem 198656 BLAKE2B c999f862753d17c186f766f82ede6c7fb3c773018c314825762b68025bf806e6a466b8895ddfa3046f7ac3f3af501d6feaebcb8241779de9c3a0d153589d0993 SHA512 a2b756dc1cf1abb98e4b60b9b56f5f610058bd840b67c991d6bfb3da2523b0f77a5854147f9d14ca461d573e51fbe3ba35c83659af5c031086710970fac6665a
 EBUILD rcairo-1.16.6-r1.ebuild 1821 BLAKE2B 3f3e32d3c33ad7309f2499d0e1871cc50313566031b877dd48dff32d162c22a6f94f0196aa410ee76d2fd1426b67ccfaaf060ddb785169a8d48039de9c830850 SHA512 aead6c987107e36fea1d24522e4aa3307e972f9562ec56f7281e5125a1d1c1153de72f0a3d85854481b141e7d44c6d81a9b341f5eb5b5065ebb155d09280a5f2
-EBUILD rcairo-1.17.5-r1.ebuild 1788 BLAKE2B 203d357708f5b32d7e88df79255f28ddf9caa4f6df6515af3f706b53d4b1731715ceb0031c7778df42c436c7790d7caa60c6f12d4082573753c86000f1adbcc6 SHA512 c9d40b2bcd5d2b3d46861b8cf6223af0c93187216bb51ae7e121628c8d2d5f5a20a2b3c267d9e4cb09a73a804f080b2347585ea16f9bddf9d04c7cc5ff4f21a5
+EBUILD rcairo-1.17.5-r1.ebuild 1787 BLAKE2B aab18382ee5b47ad524587a71bf404a3d2dbcd05bddd0a442992a9a278b6e12250be3aee4dfe6e09dad947b1fb537b07f425c56446727de9c317f1517ffd7748 SHA512 47b0128fd244cfe49401a8599b87667047b052e8fb3312668d1c4694da3fc60bb85c9af8092aa3a5e78c0f772f7438b0cd81443b14f0ac253c6b9d236919421c
+EBUILD rcairo-1.17.8.ebuild 1765 BLAKE2B 375150d9f4df23d356f239336430a3ec2d6ebc4100783a8f4a48059dcae967e9db142b6d1a8c69f67673bb206fbcf3d1d03ee6c1bdbc6f45763972327f395e8e SHA512 68ad102c1af329f603964a88a1dbe7613d3ce302ad006c1883f557489b7a8089f52e9e46eb60f306823d596df28d17e323fbace89ce90f42fce665f7ea4f4919
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/rcairo/rcairo-1.17.5-r1.ebuild b/dev-ruby/rcairo/rcairo-1.17.5-r1.ebuild
index 68a74fc47c0a..14576037d080 100644
--- a/dev-ruby/rcairo/rcairo-1.17.5-r1.ebuild
+++ b/dev-ruby/rcairo/rcairo-1.17.5-r1.ebuild
@@ -24,7 +24,7 @@ IUSE=""
 
 SLOT="0"
 LICENSE="|| ( Ruby-BSD GPL-2 )"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
 
 RDEPEND="${RDEPEND}
 	>=x11-libs/cairo-1.2.0[svg(+)]"
diff --git a/dev-ruby/rcairo/rcairo-1.17.8.ebuild b/dev-ruby/rcairo/rcairo-1.17.8.ebuild
new file mode 100644
index 000000000000..9476d5c60e1a
--- /dev/null
+++ b/dev-ruby/rcairo/rcairo-1.17.8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27"
+
+RUBY_FAKEGEM_NAME="cairo"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/cairo/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for cairo"
+HOMEPAGE="https://cairographics.org/rcairo/"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Ruby-BSD GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+RDEPEND="${RDEPEND}
+	>=x11-libs/cairo-1.2.0[svg(+)]"
+DEPEND="${DEPEND}
+	>=x11-libs/cairo-1.2.0[svg(+)]"
+
+ruby_add_rdepend "dev-ruby/red-colors"
+
+ruby_add_bdepend "
+	>=dev-ruby/pkg-config-1.2.2
+	dev-ruby/ruby-glib2
+	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 dev-ruby/ruby-poppler )"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency
+	sed -e '/native-package-installer/ s:^:#:' \
+		-e '/def required_pkg_config_package/areturn true' \
+		-e '/checking_for/,/^end/ s:^:#:' \
+		-i ext/cairo/extconf.rb || die
+	sed -i -e '/native-package-installer/,/Gem::Dependency/ d' ../metadata || die
+
+	# Avoid test that requires unpackaged fixture
+	sed -i -e '/sub_test_case..FreeTypeFontFace/,/^  end/ s:^:#:' test/test_font_face.rb || die
+
+	# Bug 790131
+	sed -i -e '/^install-headers:/s!$! $(TIMESTAMP_DIR)/.sitearchdir.time!' \
+		ext/cairo/depend || die
+}
+
+each_ruby_test() {
+	# don't rely on the Rakefile because it's a mess to load with
+	# their hierarchy, do it manually.
+	${RUBY} -Ilib -r ./test/helper \
+		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	insinto $(ruby_get_hdrdir)
+	doins ext/cairo/rb_cairo.h
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/red-colors/Manifest b/dev-ruby/red-colors/Manifest
index 2735ab590624..3af5fe9bd89d 100644
--- a/dev-ruby/red-colors/Manifest
+++ b/dev-ruby/red-colors/Manifest
@@ -1,3 +1,3 @@
 DIST red-colors-0.3.0.gem 104448 BLAKE2B 46b99c755e745eadfc1af61c024df66d54b583c9fbad37522971d44ee42b1db9a5148529a37252ad50cdb276fee8e58aca2afdc190bac3098baa67857eac0d6a SHA512 baa05634213a46da968a42e478db097c5bc47187e61807a3b3c30b8109a0fae63d587e5a3227b5bca75b921304b9d5e24a5ba945361dd5eba1c25235889c2cf1
-EBUILD red-colors-0.3.0-r1.ebuild 405 BLAKE2B 3cfc7a7c347fdd32d96ef32756bc361ed9192074213feb6619d4f607d34503145dcfb7d35e80184883846e0cfa62e377c8b45e2aee1af2402e72a4179186c73e SHA512 c5c3229c4ac3aef4fe8e08efddb07c2be65beb4a3678dfd21a256c5890b43354e495260a7986ed481c8bc39b74ecd3c24a50668a5e483232c39f484b13edbc25
+EBUILD red-colors-0.3.0-r1.ebuild 404 BLAKE2B f685025534cb88c458920f5d4a0684a31decb94e0e74161fa56c8f5f30b43785d395ad5b73f5c2c40e1b1c58848471771583c14a978c56f07d68b70fdf7520b2 SHA512 d03ddc715fd6e57aca74d00510b1fc6805818f6da0dcd6be177c8d62195ea7378ecbd8dd6b013dedc4717ef63b7f8a4af097f4ec1773f355c7c79a9cee5c83ee
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/red-colors/red-colors-0.3.0-r1.ebuild b/dev-ruby/red-colors/red-colors-0.3.0-r1.ebuild
index 09c203b5d5e0..8aa565aee547 100644
--- a/dev-ruby/red-colors/red-colors-0.3.0-r1.ebuild
+++ b/dev-ruby/red-colors/red-colors-0.3.0-r1.ebuild
@@ -17,4 +17,4 @@ IUSE=""
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 613b8c391f22..abdde06640bf 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -1,9 +1,7 @@
-DIST regexp_parser-2.3.1.tar.gz 92120 BLAKE2B e4dc8d3d38a260be0d21812703380af418ea6b87c1fff66048111e2d5295b04589cf3d838f3e9eb330f300c7b49c8ccb18867c6fac41e55c0c623cc0206d2c85 SHA512 3f2502afaaeeffe6738c0fa83717f93af22de8704a1ce3cfdae910be287a6bbbab5dcd80d9ce7fb840acabea8d55a0cb06bca1696820f5e568b75c96360c3895
 DIST regexp_parser-2.4.0.tar.gz 93162 BLAKE2B cab80ca22b1f34d60a47f7bb3f671e2a7af46b598250a0d1f85049b5b682800badf82c7f0cfc676808999d4128bd8b8a6d2bd073d8a771ee7c07253f1e24e5ce SHA512 cd7a9d5d3d4882753b47a8369a807b3c6d943e36a66d0001d51d5d37d19a46c2ba078217d95952f1dc7c7434699a35bbd6414cd45264db08a0173f887a8d4826
-DIST regexp_parser-2.5.0.tar.gz 94251 BLAKE2B 203dcef35f36dec5abd737f56aeb826d102fed875ac90f36521ecdc09c4708ab19ea48dcb6d34259c9358e2db112a34a891dd1f61f0ce322318dd010350e81be SHA512 1ea8082874f6ec8f97f1015fc3f6efb87fd59fafa74c92d0f54d4f649be2a5111ffad400851f3fc3307cc5c361c22a2372b12f1af51f5ac5903e407f49c2e8ff
 DIST regexp_parser-2.6.0.tar.gz 96082 BLAKE2B 13247e32002ff2b7d33cb24ce20b4841b11202c9427c701e4e970c30e24172bcae949680a7b33130c61050996b49fafd535f8f7f4bc853a6780738d5901a1846 SHA512 1d05f664de803253a000ded43cf4ed492914eb285bdeb1613597568f13804587c829f80289e11ba00274b25862331e36010d5214e64abc1ec3fa9cd9895cb863
-EBUILD regexp_parser-2.3.1.ebuild 946 BLAKE2B 1c488c5a84b6d816c9a57bcfdf9e20e6cc8ddb95092abdd41580972aacae2f527776454af6ff11e24e5677b495dea2f736d249d347bd87487563c86aed28e4e7 SHA512 5f96b5ff1110a0c24b2d989888b268cbe5e205cc455b4a53ed54eaef8969898bced8c393e602b0e329945f48f8454ea4a34d6ba9da201a1b62eb5e662c6c3af6
+DIST regexp_parser-2.6.1.tar.gz 96292 BLAKE2B 0b981aff33e31c821bff82348d84b755532460a57d328e50b123eb73c04553ebaaf6f4bb360c59798ef0ad1886904e8cf95202a4b50206fa6e88fedf00492a32 SHA512 990d2af8577466887be24f9a942fe1f833a73c2e1048f7ce9d11aced3179fda5385eae9234c6242f306b71ec6014bf087bf67f789e23c513306f307a114f855f
 EBUILD regexp_parser-2.4.0.ebuild 946 BLAKE2B 1c488c5a84b6d816c9a57bcfdf9e20e6cc8ddb95092abdd41580972aacae2f527776454af6ff11e24e5677b495dea2f736d249d347bd87487563c86aed28e4e7 SHA512 5f96b5ff1110a0c24b2d989888b268cbe5e205cc455b4a53ed54eaef8969898bced8c393e602b0e329945f48f8454ea4a34d6ba9da201a1b62eb5e662c6c3af6
-EBUILD regexp_parser-2.5.0.ebuild 947 BLAKE2B 97e9f9bd11427029254af7882489c65f49bc70bc916d36d06b1c1cb5d0e9563478b55f4a5f84cb651d949b1f411b2f4d177b2547d5e0b248bef204eb7fe1c81a SHA512 c5f08700a0dc3f3861a607a7e5a66f3a4263c768c785be8d55be2dd6ff38a8a319b825fa8b6ad0cbc615e46024a0b940e3f8bd2f93eabfbf86483638d6613996
 EBUILD regexp_parser-2.6.0.ebuild 940 BLAKE2B aef5d5bbf029567c80b3cf91ed733818383bb74a0ae9ca52832b111453a561936607e8dfa416a105a5e06f5c32fe5cade4d66913e43a41c400eaafe14ccbaf8e SHA512 564331c0ce7aa7a42fadee21374e74fe29b3bcd5a19414df67d64c944eabad1e3b800f45f0a16f66f50258c3f01167451f06b1571c06988cbb4a4ca738eaf8b1
+EBUILD regexp_parser-2.6.1.ebuild 940 BLAKE2B aef5d5bbf029567c80b3cf91ed733818383bb74a0ae9ca52832b111453a561936607e8dfa416a105a5e06f5c32fe5cade4d66913e43a41c400eaafe14ccbaf8e SHA512 564331c0ce7aa7a42fadee21374e74fe29b3bcd5a19414df67d64c944eabad1e3b800f45f0a16f66f50258c3f01167451f06b1571c06988cbb4a4ca738eaf8b1
 MISC metadata.xml 346 BLAKE2B 91c8aefa1a1d1f9f8b70a36b65524b8e9bc41fb22d7e411e1501d74dde8abdf1fec981340832046edce885ee296cf1beea48fa57678bb5af2c39f957670a5f82 SHA512 15b3c9a8a7fdbbd2f782308687f6551cb626732c0858c2cc88640b8ac2246e453667dfe6e12ff3547c2d7e267304cfdf70fe913ade8d802c321a3df12b699a6a
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
deleted file mode 100644
index d7fdf1615b58..000000000000
--- a/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
-HOMEPAGE="https://github.com/ammar/regexp_parser"
-SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "dev-ruby/rake dev-ruby/rspec:3
-	test? ( dev-ruby/ice_nine dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake ragel:rb || die
-}
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.5.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.6.1.ebuild
index 6f59b303702a..709592b3f05e 100644
--- a/dev-ruby/regexp_parser/regexp_parser-2.5.0.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-2.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/roadie/Manifest b/dev-ruby/roadie/Manifest
index 15bc1ca95917..70ca6ad2e7f6 100644
--- a/dev-ruby/roadie/Manifest
+++ b/dev-ruby/roadie/Manifest
@@ -1,7 +1,9 @@
 DIST roadie-4.0.0.tar.gz 50727 BLAKE2B 671c5260f4a181e4a50d136e4c6e96e96a3bb51adc7cd88d070b558af0d1d858e712a8f6d586aaea5c72b735db41a54ecb1833b74b3e76f7838a3323a69fb5f3 SHA512 ad42ff83c7983e8cce1506f6b72d66e47a860251749eebd3cd65c2114859d3d8a8103d309964aa53875cb07a83393b086fb6c58db88d95a84059abb514d12665
 DIST roadie-5.0.0.tar.gz 50262 BLAKE2B 94e2ecb83252ff1e3d20dd383cef5f65922dacf0febaaad8d5943890640f0bd7cc2774cb9f0bd87faff60dee9ea1ec27c562368f451ce8811faf968c172f661e SHA512 531de622ff3c96ec702e04238c512b3b64dd352a55151db2becac0d8dc1ca933b76914058130ff468030199b7dfe80e1bb89366db2bb3b86519f74911cd4ee29
 DIST roadie-5.0.1.tar.gz 50380 BLAKE2B 38cbc3697aacc4932ec817be2face87e0eeb89b9de6053b753b4db1aadf7ef4d3205148a43a722f9d0691c3200e23d1d4cb345adb8deaebfdfa13c63238a4361 SHA512 a23aafd9cf6b21ac3ca00a29bcbf40b7c11366c09f013a31d0bc92194729735dda3370e43700fce88a3cd1e1fccfc7089b3fe126a4f95ab71f3b93a85670d623
+DIST roadie-5.1.0.tar.gz 50866 BLAKE2B efab67901951f36877cf5f4a41e604e69f672f4ba3b774a26992de947d52b8e1f1c1bf10b4d36212b80542942d29be066184fe4237ac31895ac5bbb2ca27ae80 SHA512 490a5def87bd2a33eff732fc144881fc23e8838ccbd7392a0ecabcde2eb7736445a94eb0580080d616f7c6594c63da6455f1b55636dd542372569bee4a70de78
 EBUILD roadie-4.0.0.ebuild 940 BLAKE2B f4ee3f3394d4335d29ffb12e7d277c3e3af033bbf10eeaf147bf064bb76823a7f582eb4d11a10040d62963f6e7eb145917e48b9dd9a51feb13d7912bb0241ee3 SHA512 406715df5ba46f015961eb28dc3274880098f229fbe3194bb83348e5f25e6f1dd40e15806b3f55bf28ae2c7ed1d1c0f4cc6bd446661685423a01364b80d1773a
 EBUILD roadie-5.0.0.ebuild 940 BLAKE2B e652e3c6834877ca8bb08180e84fdafea05271d807c0c876ab171101853758ade5116971160eb4d1a9d1d50d7691fa40a7b78a7951cc0495f38a8852c2fe313c SHA512 f26b1c881d983927b1eecef896c3ddcbe7fdc4e9d40dab154f11559b9f96550d5c90e2ce4b2958775857dfca970aec24f9ebba42e438b9e9eee029c4ccf04216
 EBUILD roadie-5.0.1.ebuild 940 BLAKE2B e652e3c6834877ca8bb08180e84fdafea05271d807c0c876ab171101853758ade5116971160eb4d1a9d1d50d7691fa40a7b78a7951cc0495f38a8852c2fe313c SHA512 f26b1c881d983927b1eecef896c3ddcbe7fdc4e9d40dab154f11559b9f96550d5c90e2ce4b2958775857dfca970aec24f9ebba42e438b9e9eee029c4ccf04216
+EBUILD roadie-5.1.0.ebuild 933 BLAKE2B 0f433ac8a76b29065ea4c1bfd6ad1434300585b116730fe1ce60b760a8c8cf6b92d8809f790a68e40b5e5094cdd67b296a4c39a2166395ed90dc5094721438fc SHA512 c4145bd268bb50dfcbeac96875790434fd1d923c2d3f275f2f24d0a6dc973aaf9124f32a3ffe693505160410a2952e9144bc4f58087833ec7ad136f68db22d91
 MISC metadata.xml 329 BLAKE2B 284cf81b381de2aeee79679f5076442cd9bb136f82167bfe983c6fbbc5a0a22f1d9223792016d3b7d3171e76b6488ebf7ecf64332c1cb6df91e177fd2f84cbe2 SHA512 572ef516cbfb9d8c721daf08c83dcf65ab554a9f62623f91f5526788f7a879d23b98efee17c5a2b84d77b0d0fdadb6e21e1e41868623701a89a89a1cd1db3f21
diff --git a/dev-ruby/roadie/roadie-5.1.0.ebuild b/dev-ruby/roadie/roadie-5.1.0.ebuild
new file mode 100644
index 000000000000..bb0dc9eac450
--- /dev/null
+++ b/dev-ruby/roadie/roadie-5.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making HTML emails comfortable for the Rails rockstars"
+HOMEPAGE="https://github.com/Mange/roadie"
+SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/css_parser-1.4.5 =dev-ruby/css_parser-1*"
+ruby_add_bdepend "test? ( dev-ruby/rspec-collection_matchers dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e 's/git ls-files/find * -type f -print/' \
+		-e '/test_files/d' \
+		-e '/css_parser/ s/~>/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index d27e2d29b60d..e08f58be00d6 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-delete-merged-branches/Manifest b/dev-vcs/git-delete-merged-branches/Manifest
index 117e81b5bd08..1c513452be9b 100644
--- a/dev-vcs/git-delete-merged-branches/Manifest
+++ b/dev-vcs/git-delete-merged-branches/Manifest
@@ -1,3 +1,5 @@
 DIST git-delete-merged-branches-7.2.0.tar.gz 38948 BLAKE2B ceec3333221a75b7da8a0d0287c5fea9095136f3ccd4b3f59b205cfca6b2e394cf766aed632f9e94b34ec8f7bb3e1b4ef63c358581e0cf3df8ba33c19915aaf5 SHA512 cc7e250b98caa446af246067727768ae771235fa9d89cd5a319fa2143c826e13c9c2938cf399baefa217be95073fcf50d64a771f98fb12f10d4320b62bfe8b05
+DIST git-delete-merged-branches-7.2.1.tar.gz 39267 BLAKE2B 3514cb84dcd64e0f935eaf806dfbda6227f0c25dcafcd0c33de49fcfdeab330ca1636f63bef0bbd78c19475b0d039b38dbd1a86be614041313d83156d9f1f0fe SHA512 d7849ca309378bde5d09f4c663f65cd7b8a0e40425e134b3c5c4814220070d41da517c489d021036332bf3f85d4dd863b1a5b991549de0241bbaa2db69b9699b
 EBUILD git-delete-merged-branches-7.2.0.ebuild 925 BLAKE2B dacf10ae2a9cf9bcd640fa07a8ff91684a42e23c6476c9db1634c93cd7797c945df619632bfda2f151582dd2c7cf1378c558d1d651ff1c90c3717e828be03a70 SHA512 b2d6c68ed789f560900bd55d3523a5ecd762cb36ba8eeb6be48783d31e144e247eee4b067a8eaed57ddbfca68dcc2238b09c8fe339e4eb2f28d8483cd2417688
+EBUILD git-delete-merged-branches-7.2.1.ebuild 925 BLAKE2B dacf10ae2a9cf9bcd640fa07a8ff91684a42e23c6476c9db1634c93cd7797c945df619632bfda2f151582dd2c7cf1378c558d1d651ff1c90c3717e828be03a70 SHA512 b2d6c68ed789f560900bd55d3523a5ecd762cb36ba8eeb6be48783d31e144e247eee4b067a8eaed57ddbfca68dcc2238b09c8fe339e4eb2f28d8483cd2417688
 MISC metadata.xml 418 BLAKE2B d45c035701e91c3dfa4fb4f2be0d083c1d5d1c511f50b5299340d815116ba80a13af3ccf11ccb120a0d26c2ebf941718820419885c20f26044739bab748db7cb SHA512 2eb9c709a7bddb9c24f4c8422259b4555fe9b13ac0a15c26683f759c7e1b75653011e974a9d8845aa848d52f7ac33f8fa256aacc3c240cf34af4ebcca7aff683
diff --git a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.1.ebuild b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.1.ebuild
new file mode 100644
index 000000000000..6ec57561f7ac
--- /dev/null
+++ b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line tool to delete merged Git branches"
+HOMEPAGE="https://github.com/hartwork/git-delete-merged-branches"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="full-name-executable test"
+
+COMMON_DEPEND="
+	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-3.0.18[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	full-name-executable? ( !dev-vcs/git-extras )
+	dev-vcs/git
+"
+
+RESTRICT="!test? ( test )"
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	if ! use full-name-executable; then
+	    rm "${D}"/usr/bin/git-delete-merged-branches || die
+	fi
+}
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index f8f7aa7fd9da..e4010dce2177 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/ponysay/Manifest b/games-misc/ponysay/Manifest
index 4b04295190c5..58df34626e6e 100644
--- a/games-misc/ponysay/Manifest
+++ b/games-misc/ponysay/Manifest
@@ -1,4 +1,4 @@
 AUX ponysay-3.0.3-python-syntax.patch 1584 BLAKE2B 5f13613d7a43df44662ebe9d6cb995bba3ee8629cdf45546e895bbda64bea03029db25d0dc75c2263f77fd51c3b8d2d43f5aa7d48c02089b1413f191e7888a29 SHA512 d28d85313881e2e48c3648db0f99686a2d5facd82cb771219737075043d162047190a4e7a9cadac15b20c6081add90029535e8b1e17dfdca191f6d8e994c25ed
 DIST ponysay-3.0.3.tar.gz 2139074 BLAKE2B 3ba477268d68ff9a92bad8028d0b960a2a6152057146368723fea432100a71517c0c343d34b2b1c580fcfa1945bdc273fed276cf4a10c702514e6699cda87a2c SHA512 d6ff905404192bdc207952a4a914458d7f25ddcfcea95763ae277a2a3bc7ab33e86a0a229c1b10ff7295b7a89d6e1b61406feefb6bdf9026f4076d0ed70dbe93
-EBUILD ponysay-3.0.3.ebuild 1529 BLAKE2B a1c690db2c5ec61409c4fb1a93f81fa55671de3e00745f97c062ea6feecd3282ed8315bb72f15c08ac688019bdd40b3b22909a72367d8f944acca746d24751cb SHA512 1c2e63d030e71e2d51d7a0b83a8d9e4aaa14020d9e78d49911bef5425393055570a799ff5402bbd88df29fc7099a9a0cf9e801cd6b51818772ba968eee1ebde0
+EBUILD ponysay-3.0.3.ebuild 1536 BLAKE2B ccee54cbb62edaa216eefd6080cfabacff4914e1a7ec1daf01e632efef6b8728a9c7780790480e545440a67e38c50b8a13f105189eea5b7ce222aa1c2e9c686e SHA512 d8e988c65cd6e1f7bc4dd798af11d05ac01ffb9be230ceaccd8bfaace2a9a60f348d0c65812795259d10e5e8ea9041e67d61812f7eaa1722d95c8198fd1b38ae
 MISC metadata.xml 501 BLAKE2B 635e60befc4dd4592e1b31c261eeefe207ffc41818df2c5fdcb04d775d35522a9513a871d1e1066715dd87373e259cd036fb5523d81c09cce163a0ec776c3cc1 SHA512 94c2a5bb13b2ee021c02489199c2decf82fbd17ccfba999a0ca80437271516c8fc41cebf6aab56332ddc43e75a5b22734333ecd7ade4ab484f3d16221578fa55
diff --git a/games-misc/ponysay/ponysay-3.0.3.ebuild b/games-misc/ponysay/ponysay-3.0.3.ebuild
index cc2080eb00b5..9f87d7d7bec1 100644
--- a/games-misc/ponysay/ponysay-3.0.3.ebuild
+++ b/games-misc/ponysay/ponysay-3.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/erkin/ponysay"
 SRC_URI="https://github.com/erkin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~x86"
 IUSE="doc +non-free bash-completion fish-completion zsh-completion"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 27a52a9f03b2..5cdb678aa2c4 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f274ea470811..11ad1d6972a7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 26 Nov 2022 12:39:47 +0000
+Sat, 26 Nov 2022 18:39:47 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 79c947727ce4..5f299dc07ac1 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 537682 BLAKE2B 5ea36706e9f3100f98a8bfc48465fc9c9965ad20b834454f02d0d345f47d095e5a9ed35b5f6e37007ee947d09446b720eafc19bfcbc8f9bac4db48a6a80580dd SHA512 0f5654de23f73899b445d3d10fa87c3ab643f77308df25999549e1b63748b5f101eb3f130afac8fb3e03eab64646d0e2016efd11a0f4eccc7a3b6117155d8d63
-TIMESTAMP 2022-11-26T12:39:51Z
+TIMESTAMP 2022-11-26T18:39:51Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOCCRdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOCXXdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCY/Q//U430YdPmWG1oavLhbKwpivJWvuMIdMTj1P67WoCqwV74ixO+fzZ86L1Y
-XrnbA3DAPU/GbfDnHWGKgSrLKyF9TkbIaI5vtfhUNG2fXBvKGmeYL8ZCRqcClcZj
-E0n7uHw+tf2EguQ7YEA72ruiFRRHV4fYUKP2cIR218u8+wbPJrWlZHo544/BopDj
-eG6Dl1eMhgZdfqylXOAl5TgdsK61VBAUVKXlDLS7S7kdFf2KPKxQBeHDpcIW3gwf
-upwqdKnaf03JyTGGxSDnYf3q7xcBPB94LIuwiYwmCQshoUWVuKzGlczq7BK5vxcz
-0Db8lzJ8gQgEerMgRDXJLdGuXEkwyjFs0t7xR48IRwszzNN27krQpEbe7QjNQ8qx
-/g5tNS2A+PjoY8bA8ow9nuQ8ictq7b5YJubkai8mWf0Iay9jRxUzFzxanITgiL4G
-jG6AelkonsmqdWl8voI5jpD/ktbf2D2rWNidtFea8cxxM9ts6k9y2zfjl6vJ2vyU
-LpYLAdB+sbA7wImwvyLskgHQ2zh0QwRGAxVB7QTrKq3EqIU+rPJvvfQzGdE10AjI
-uQb7vn7YICAD5qlGfhSAiy7ercV55wpGKSsczULGSikHvfS2KUJtf3vcixKbeFKF
-u90xjTecRx42ptr9G9LWrZla9dZ5GylYFkdC/t44Q+4PV9ZysGc=
-=Kr4T
+klCWpRAAqCkRKeZ82TJvPZ3u5IVkPbO8PSIB8nve1sAFFTTOo17JualXn3QHIH99
+t0P1LJPMO5JFBxJGqHBl6I5Ay3maqlEdhV3EPf+sGacLg0Rt02YYiJ9/KgT7/7ad
+9D81uDKKsXhMGOmPNHZXgNMN/MHOSCHrUlJruApPgdwHEKXj1bkiZVzwNEoyL6oQ
+Gz61HKSvdYeykPWFNmgKUhlZFxnntTEsuOLVU4HotUiBJ3eozivkAzANbvV86vVN
+GXk8nfHnmvYr4NbTMBmiQSKbX/wMbyJHmNOTpDG6VD2xP9WXdvVSqNfa2DJAVHKp
+lsdnk7sSyfulUvmbYjKjZMnUCbGjsRfYJ9zxfUVJuAyYOOanjH6v+2pmCVOqrDJy
+eGU9us8O8U3FyuCcvvUyQYuLtEnnyOCQQO696YtAbB5XO5PqDFSKAJlA+pvVy/zZ
+S6EiUXnJiVcpHOWN3nn+xwFVN56llYKCPPNxLbWi2FN0qiOzipY0Kmfx52i9vo9Q
+xlHNmVqdV4g1Qd1bG2z+WCVD2hhrBglUJZAFt1bLJDIHW8bIX9jVdHEnTqX3e+VT
+Zw7xxkzBdh0rVGO4Q1cPCjDO6lA8COGzpcy2P4HglcA8Ghueh1I3rwNEKiWyh+Jv
+TTJK0qqwuQjKf6PrIuvx4jfKV0l4oxqEDQII+oUjryaTQw2OYOE=
+=LDRd
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f274ea470811..d895e658b5ce 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 26 Nov 2022 12:39:47 +0000
+Sat, 26 Nov 2022 18:39:48 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index be7dc2476145..40f7a0408597 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 155d25f45759..cc9c4b9ce39f 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.54-r2 b/metadata/md5-cache/app-admin/apache-tools-2.4.54-r2
index b0b047dc780e..2abaf6acefff 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.54-r2
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.54-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://httpd.apache.org/
 INHERIT=autotools toolchain-funcs
 IUSE=ssl
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre virtual/libcrypt:= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.54.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=13bb6c6cc9d1ebb277aa485c71d9add3
+_md5_=e51d869918ac4a2130ab01392066fdf5
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 95804eb7957c..cc40942647f0 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/mousepad-0.5.10 b/metadata/md5-cache/app-editors/mousepad-0.5.10
index 6dfa0779a93e..de4e0a491274 100644
--- a/metadata/md5-cache/app-editors/mousepad-0.5.10
+++ b/metadata/md5-cache/app-editors/mousepad-0.5.10
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst postrm
 DEPEND=>=dev-libs/glib-2.52 >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0.0:4
 DESCRIPTION=GTK+-based editor for the Xfce Desktop Environment
 EAPI=8
-HOMEPAGE=https://git.xfce.org/apps/mousepad/about/
+HOMEPAGE=https://docs.xfce.org/apps/mousepad/start https://gitlab.xfce.org/apps/mousepad/
 INHERIT=gnome2-utils xdg-utils
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=GPL-2+
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.52 >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/mousepad/0.5/mousepad-0.5.10.tar.bz2
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2065d6f2a0e3ccac9e2535294f1809c8
+_md5_=2eff6c25de9d0cc2780c9d5b25e269cb
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 8f023d871b90..de8aad5564a6 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/eldev-1.1.3 b/metadata/md5-cache/app-emacs/eldev-1.3
index ee29b826e75a..d07a760ee4f2 100644
--- a/metadata/md5-cache/app-emacs/eldev-1.1.3
+++ b/metadata/md5-cache/app-emacs/eldev-1.3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.4:*
 SLOT=0
-SRC_URI=https://github.com/doublep/eldev/archive/1.1.3.tar.gz -> eldev-1.1.3.tar.gz
+SRC_URI=https://github.com/doublep/eldev/archive/1.3.tar.gz -> eldev-1.3.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=248b21ab3868a0f8d85d2cea4d8cc553
diff --git a/metadata/md5-cache/app-emacs/paredit-25 b/metadata/md5-cache/app-emacs/paredit-25
new file mode 100644
index 000000000000..88a354676497
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/paredit-25
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Minor mode for performing structured editing of S-expressions
+EAPI=8
+HOMEPAGE=https://paredit.org https://www.emacswiki.org/emacs/ParEdit
+INHERIT=elisp
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~matthew/distfiles/paredit-25.tar.xz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=0ca5769fc2c5618ea4c2c86491ca982b
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index c02e1250256b..cdaa17302666 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/uudeview-0.5.20-r3 b/metadata/md5-cache/app-text/uudeview-0.5.20-r3
new file mode 100644
index 000000000000..30e31da9c8f6
--- /dev/null
+++ b/metadata/md5-cache/app-text/uudeview-0.5.20-r3
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure prepare
+DESCRIPTION=uu, xx, base64, binhex decoder
+EAPI=8
+HOMEPAGE=http://www.fpx.de/fp/Software/UUDeview/
+INHERIT=autotools toolchain-funcs
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a17d3490741c185bf208ddc918381838
diff --git a/metadata/md5-cache/app-text/xml2rfc-3.15.3 b/metadata/md5-cache/app-text/xml2rfc-3.15.3
new file mode 100644
index 000000000000..5a4cac48769a
--- /dev/null
+++ b/metadata/md5-cache/app-text/xml2rfc-3.15.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dict2xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/weasyprint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/noto[cjk] ) test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ConfigArgParse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/intervaltree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/google-i18n-address[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycountry[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Generates RFCs and IETF drafts from document source in XML
+EAPI=8
+HOMEPAGE=https://ietf-tools.github.io/xml2rfc/ https://github.com/ietf-tools/xml2rfc
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ConfigArgParse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/intervaltree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/google-i18n-address[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycountry[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ietf-tools/xml2rfc/archive/refs/tags/v3.15.3.tar.gz -> xml2rfc-3.15.3.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=93415303d8fc5d4acaee4ceda5f85038
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 0e184ccbdd1b..bc6edc1b74a2 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/gradle-bin-7.6_rc3 b/metadata/md5-cache/dev-java/gradle-bin-7.6
index 34714d0b01d3..b6d9dea68b6a 100644
--- a/metadata/md5-cache/dev-java/gradle-bin-7.6_rc3
+++ b/metadata/md5-cache/dev-java/gradle-bin-7.6
@@ -9,7 +9,7 @@ IUSE=doc source
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=app-eselect/eselect-gradle >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=7.6_rc3
-SRC_URI=https://services.gradle.org/distributions/gradle-7.6-rc-3-all.zip -> gradle-bin-7.6_rc3.zip
+SLOT=7.6
+SRC_URI=https://services.gradle.org/distributions/gradle-7.6-all.zip -> gradle-bin-7.6.zip
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
 _md5_=c62185d27694066bfc0c810d02fd8bcb
diff --git a/metadata/md5-cache/dev-java/mill-bin-0.10.7 b/metadata/md5-cache/dev-java/mill-bin-0.10.7
deleted file mode 100644
index 2a9021223ee5..000000000000
--- a/metadata/md5-cache/dev-java/mill-bin-0.10.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A Java/Scala build tool
-EAPI=8
-HOMEPAGE=https://com-lihaoyi.github.io/mill/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8:*
-SLOT=0
-SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.10.7/0.10.7-assembly -> mill-bin-0.10.7
-_md5_=3a6ba799e376fdf7242adbdd130f301a
diff --git a/metadata/md5-cache/dev-java/mill-bin-0.10.8 b/metadata/md5-cache/dev-java/mill-bin-0.10.8
deleted file mode 100644
index 9f2ee40654e5..000000000000
--- a/metadata/md5-cache/dev-java/mill-bin-0.10.8
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A Java/Scala build tool
-EAPI=8
-HOMEPAGE=https://com-lihaoyi.github.io/mill/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8:*
-SLOT=0
-SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.10.8/0.10.8-assembly -> mill-bin-0.10.8
-_md5_=2b4d4ada0013d7b03d498570ab932074
diff --git a/metadata/md5-cache/dev-java/mill-bin-0.10.9 b/metadata/md5-cache/dev-java/mill-bin-0.10.9
index 71033b4bb0c3..b48c4fc396f1 100644
--- a/metadata/md5-cache/dev-java/mill-bin-0.10.9
+++ b/metadata/md5-cache/dev-java/mill-bin-0.10.9
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=A Java/Scala build tool
 EAPI=8
 HOMEPAGE=https://com-lihaoyi.github.io/mill/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:*
 SLOT=0
 SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.10.9/0.10.9-assembly -> mill-bin-0.10.9
-_md5_=2b4d4ada0013d7b03d498570ab932074
+_md5_=3a6ba799e376fdf7242adbdd130f301a
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index c15ebc3b6d6e..dc715ba93989 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/gnucobol-1.1 b/metadata/md5-cache/dev-lang/gnucobol-1.1
deleted file mode 100644
index 95f1c8f300a9..000000000000
--- a/metadata/md5-cache/dev-lang/gnucobol-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/gmp:0= berkdb? ( sys-libs/db:4.8= ) sys-libs/ncurses readline? ( sys-libs/readline ) sys-devel/libtool
-DESCRIPTION=an open-source COBOL compiler
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/open-cobol/
-IUSE=berkdb nls readline
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=dev-libs/gmp:0= berkdb? ( sys-libs/db:4.8= ) sys-libs/ncurses readline? ( sys-libs/readline )
-SLOT=0
-SRC_URI=mirror://sourceforge/open-cobol/open-cobol-1.1.tar.gz
-_md5_=cd0256db5c369bb0ff9dfbd999b5a506
diff --git a/metadata/md5-cache/dev-lang/gnucobol-3.1.2 b/metadata/md5-cache/dev-lang/gnucobol-3.1.2
index 2a3fb11f7f57..cf688d9a7e0b 100644
--- a/metadata/md5-cache/dev-lang/gnucobol-3.1.2
+++ b/metadata/md5-cache/dev-lang/gnucobol-3.1.2
@@ -1,13 +1,15 @@
-BDEPEND=sys-devel/libtool
-DEFINED_PHASES=configure install
+BDEPEND=sys-devel/libtool sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/gmp:= sys-libs/ncurses:= json? ( dev-libs/json-c:= ) xml? ( dev-libs/libxml2 ) berkdb? ( sys-libs/db:4.8= )
 DESCRIPTION=A free/libre COBOL compiler
 EAPI=8
 HOMEPAGE=https://gnucobol.sourceforge.io/
+INHERIT=autotools
 IUSE=berkdb json nls xml
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3 LGPL-3 FDL-1.3
 RDEPEND=dev-libs/gmp:= sys-libs/ncurses:= json? ( dev-libs/json-c:= ) xml? ( dev-libs/libxml2 ) berkdb? ( sys-libs/db:4.8= )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnucobol/3.1/gnucobol-3.1.2.tar.xz
-_md5_=9db7be034521f989b905756e2e681fe4
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=fa0e9a18348c1085e5b52e1836760306
diff --git a/metadata/md5-cache/dev-lang/ruby-2.7.7 b/metadata/md5-cache/dev-lang/ruby-2.7.7
index c6988f0e31fb..1c97f6f70c29 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.7.7
+++ b/metadata/md5-cache/dev-lang/ruby-2.7.7
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
 INHERIT=autotools flag-o-matic
 IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/minitest-5.13.0[ruby_targets_ruby27] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27] >=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27] >=dev-ruby/rake-13.0.1[ruby_targets_ruby27] >=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27] virtual/rubygems[ruby_targets_ruby27] >=dev-ruby/bundler-2.1.4[ruby_targets_ruby27] >=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27] >=dev-ruby/json-2.0.2[ruby_targets_ruby27] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( =dev-libs/openssl-1.1*:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20191222
 SLOT=2.7
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.7.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=80da45e08c3c6f4554d71ac05f2796b6
+_md5_=53ff08b12f64aa89ad028246d4a47bb6
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 7f7b63926cd8..f73ac6086c5e 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/apr-1.7.0-r6 b/metadata/md5-cache/dev-libs/apr-1.7.0-r6
index 638b5cd3dc1c..2cfb126c7b46 100644
--- a/metadata/md5-cache/dev-libs/apr-1.7.0-r6
+++ b/metadata/md5-cache/dev-libs/apr-1.7.0-r6
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://apr.apache.org/
 INHERIT=autotools libtool toolchain-funcs
 IUSE=doc older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) selinux? ( sec-policy/selinux-base-policy )
 SLOT=1/1.7
 SRC_URI=mirror://apache/apr/apr-1.7.0.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=17b20fa36a1fe106d06ddb82b3d39836
+_md5_=8fee3031fb8e98e842dff429c73d6e96
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r10 b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r10
index db2addd9a7b9..a980d5d7d94f 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r10
+++ b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r10
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://apr.apache.org/
 INHERIT=autotools db-use libtool multilib toolchain-funcs
 IUSE=berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.7.0-r6:1= dev-libs/expat virtual/libcrypt:= berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm:= ) ldap? ( net-nds/openldap:= ) mysql? ( || ( dev-db/mariadb-connector-c >=dev-db/mysql-connector-c-8 ) ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-util-1.6.1.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	db-use	867a9246a45efc09934e0f8e3380c813	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0c4c03f90ba1dfe4dea41b9b7cd62550
+_md5_=b223cf467f0349c85d0f548e94946035
diff --git a/metadata/md5-cache/dev-libs/glib-2.74.0-r1 b/metadata/md5-cache/dev-libs/glib-2.74.0-r1
deleted file mode 100644
index e5ff80e57e57..000000000000
--- a/metadata/md5-cache/dev-libs/glib-2.74.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) systemtap? ( >=dev-util/systemtap-1.3 ) || ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!<dev-util/gdbus-codegen-2.74.0 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre2-10.32: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(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=sys-libs/zlib-1.2.8-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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[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=The GLib library of C routines
-EAPI=8
-HOMEPAGE=https://www.gtk.org/
-INHERIT=flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-IUSE=dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1+
-PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
-RDEPEND=!<dev-util/gdbus-codegen-2.74.0 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre2-10.32: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(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=sys-libs/zlib-1.2.8-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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.0.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8bde7eef9ae3e9f23ca1bcf46eb90c92
diff --git a/metadata/md5-cache/dev-libs/glib-2.74.1 b/metadata/md5-cache/dev-libs/glib-2.74.1
deleted file mode 100644
index c4546be13fe4..000000000000
--- a/metadata/md5-cache/dev-libs/glib-2.74.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) systemtap? ( >=dev-util/systemtap-1.3 ) || ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!<dev-util/gdbus-codegen-2.74.1 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre2-10.32: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(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=sys-libs/zlib-1.2.8-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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[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=The GLib library of C routines
-EAPI=8
-HOMEPAGE=https://www.gtk.org/
-INHERIT=flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-IUSE=dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1+
-PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
-RDEPEND=!<dev-util/gdbus-codegen-2.74.1 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre2-10.32: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(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=sys-libs/zlib-1.2.8-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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.1.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e790be2f45f45301bf3d3899f792ad23
diff --git a/metadata/md5-cache/dev-libs/glib-2.74.1-r1 b/metadata/md5-cache/dev-libs/glib-2.74.1-r1
index 14f03bb5a266..77922ccb9763 100644
--- a/metadata/md5-cache/dev-libs/glib-2.74.1-r1
+++ b/metadata/md5-cache/dev-libs/glib-2.74.1-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.1.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f3beac3cf75e6bb72fef9c24154c1425
+_md5_=1463024d9be779e030c4111db7517f7f
diff --git a/metadata/md5-cache/dev-libs/glib-2.74.2 b/metadata/md5-cache/dev-libs/glib-2.74.2
index 8a8f6062caeb..a71df6ab6c02 100644
--- a/metadata/md5-cache/dev-libs/glib-2.74.2
+++ b/metadata/md5-cache/dev-libs/glib-2.74.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.2.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e790be2f45f45301bf3d3899f792ad23
+_md5_=dfdc62b9f7431304c2d3306d91ce6106
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index f15c8a312506..940febe3f925 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/yojson-2.0.0 b/metadata/md5-cache/dev-ml/yojson-2.0.0
deleted file mode 100644
index 89a567aae68c..000000000000
--- a/metadata/md5-cache/dev-ml/yojson-2.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-ml/cppo-1.6.1 test? ( dev-ml/alcotest ) dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/ocaml-4.02.3:=[ocamlopt?] >=dev-ml/seq-0.2.2:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=JSON parsing and pretty-printing library for OCaml
-EAPI=8
-HOMEPAGE=https://github.com/ocaml-community/yojson
-INHERIT=dune
-IUSE=examples +ocamlopt test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-4.02.3:=[ocamlopt?] >=dev-ml/seq-0.2.2:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
-SLOT=0/2.0.0
-SRC_URI=https://github.com/ocaml-community/yojson/archive/2.0.0.tar.gz -> yojson-2.0.0.tar.gz
-_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=638295dae121698802b5428bb42ce2ee
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index a80bc81a4730..d968bb5e3500 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/httpx-0.23.1 b/metadata/md5-cache/dev-python/httpx-0.23.1-r1
index 1a29eb8c12d7..1332cdd09e63 100644
--- a/metadata/md5-cache/dev-python/httpx-0.23.1
+++ b/metadata/md5-cache/dev-python/httpx-0.23.1-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/httpx/archive/0.23.1.tar.gz -> httpx-0.23.1.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f867617d7ad3178816384e5cce918280
+_md5_=10ca992d9172c2dd92de474a7ffaefbc
diff --git a/metadata/md5-cache/dev-python/python-ctags-1.5.0-r1 b/metadata/md5-cache/dev-python/python-ctags-1.5.0-r1
new file mode 100644
index 000000000000..a287d7192ba9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-ctags-1.5.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-util/ctags:= >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Exuberant Ctags indexing python bindings
+EAPI=8
+HOMEPAGE=https://github.com/universal-ctags/python-ctags3
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-util/ctags:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/universal-ctags/python-ctags3/archive/1.5.0.tar.gz -> python-ctags-1.5.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a08203226bc35a9e4d1c87c442177d9f
diff --git a/metadata/md5-cache/dev-python/rustworkx-0.12.1 b/metadata/md5-cache/dev-python/rustworkx-0.12.1
new file mode 100644
index 000000000000..53e7f11a437e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rustworkx-0.12.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-rust[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/fixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/graphviz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/networkx-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stestr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz[gts] ) test? ( >=dev-python/numpy-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A high performance Python graph library implemented in Rust
+EAPI=8
+HOMEPAGE=https://github.com/Qiskit/rustworkx/ https://pypi.org/project/rustworkx/
+INHERIT=cargo distutils-r1
+IUSE=test debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD MIT || ( LGPL-3 MPL-2.0 )
+RDEPEND=>=dev-python/numpy-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Qiskit/rustworkx/archive/0.12.1.tar.gz -> rustworkx-0.12.1.gh.tar.gz https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download -> crossbeam-epoch-0.9.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/fixedbitset/0.4.2/download -> fixedbitset-0.4.2.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/indoc/1.0.6/download -> indoc-1.0.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/1.0.2/download -> itoa-1.0.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/matrixmultiply/0.2.4/download -> matrixmultiply-0.2.4.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/ndarray/0.13.1/download -> ndarray-0.13.1.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.2.4/download -> num-complex-0.2.4.crate https://crates.io/api/v1/crates/num-complex/0.4.1/download -> num-complex-0.4.1.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/numpy/0.17.2/download -> numpy-0.17.2.crate https://crates.io/api/v1/crates/once_cell/1.12.0/download -> once_cell-1.12.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/petgraph/0.6.2/download -> petgraph-0.6.2.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/priority-queue/1.2.0/download -> priority-queue-1.2.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/pyo3/0.17.3/download -> pyo3-0.17.3.crate https://crates.io/api/v1/crates/pyo3-build-config/0.17.3/download -> pyo3-build-config-0.17.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.17.3/download -> pyo3-ffi-0.17.3.crate https://crates.io/api/v1/crates/pyo3-macros/0.17.3/download -> pyo3-macros-0.17.3.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.17.3/download -> pyo3-macros-backend-0.17.3.crate https://crates.io/api/v1/crates/quick-xml/0.22.0/download -> quick-xml-0.22.0.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_pcg/0.3.1/download -> rand_pcg-0.3.1.crate https://crates.io/api/v1/crates/rawpointer/0.2.1/download -> rawpointer-0.2.1.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.145/download -> serde-1.0.145.crate https://crates.io/api/v1/crates/serde_derive/1.0.145/download -> serde_derive-1.0.145.crate https://crates.io/api/v1/crates/serde_json/1.0.89/download -> serde_json-1.0.89.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/syn/1.0.96/download -> syn-1.0.96.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unindent/0.1.9/download -> unindent-0.1.9.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=e209ebc459c0af90d8c8890e0623e98b
diff --git a/metadata/md5-cache/dev-python/trio-0.22.0 b/metadata/md5-cache/dev-python/trio-0.22.0-r1
index 6b0e31daee74..c8e86d94ffa7 100644
--- a/metadata/md5-cache/dev-python/trio-0.22.0
+++ b/metadata/md5-cache/dev-python/trio-0.22.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-trio/trio/archive/v0.22.0.tar.gz -> trio-0.22.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=30c88a03e07d4485f3a6b5ce41837c20
+_md5_=945ab158a365c139068c0ff4342acc4d
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 331385ca3a93..054f5c5de912 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.9 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.9
index 492748c1bd17..acdaacf4f301 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.9
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.9
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rcairo/pkg-config
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.9.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a764f8eb57e01b203dffee41745dc3bd
+_md5_=6ad1713d64e96873ab84cac639d56523
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.5.1 b/metadata/md5-cache/dev-ruby/pkg-config-1.5.1
new file mode 100644
index 000000000000..99a5b3145568
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.5.1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( x11-libs/cairo ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A pkg-config implementation by Ruby
+EAPI=8
+HOMEPAGE=https://github.com/rcairo/pkg-config
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/pkg-config-1.5.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a764f8eb57e01b203dffee41745dc3bd
diff --git a/metadata/md5-cache/dev-ruby/rbs-2.8.0 b/metadata/md5-cache/dev-ruby/rbs-2.8.0
new file mode 100644
index 000000000000..8a6bba21147b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rbs-2.8.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] dev-ruby/test-unit[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/rdoc[ruby_targets_ruby30(-)] dev-ruby/test-unit[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] dev-ruby/rdoc[ruby_targets_ruby31(-)] dev-ruby/test-unit[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=The language for type signatures for Ruby and standard library definitions
+EAPI=8
+HOMEPAGE=https://github.com/ruby/rbs
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby-BSD BSD-2 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/rbs/archive/v2.8.0.tar.gz -> rbs-2.8.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=73ba32eb27ea2f766e8b522b717d1066
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.17.5-r1 b/metadata/md5-cache/dev-ruby/rcairo-1.17.5-r1
index a1bdb6484f3d..45717104ab72 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.17.5-r1
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.17.5-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://cairographics.org/rcairo/
 INHERIT=multilib ruby-fakegem
 IUSE=test ruby_targets_ruby27 doc test
-KEYWORDS=~amd64 ~ppc ~riscv ~x86
+KEYWORDS=amd64 ~ppc ~riscv ~x86
 LICENSE=|| ( Ruby-BSD GPL-2 )
 RDEPEND=>=x11-libs/cairo-1.2.0[svg(+)] ruby_targets_ruby27? ( dev-ruby/red-colors[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cairo-1.17.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2663788b39b4fe48b134654484f9de99
+_md5_=a4368463d9eeb48ffa3604524260a6af
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.17.8 b/metadata/md5-cache/dev-ruby/rcairo-1.17.8
new file mode 100644
index 000000000000..4ac0622bc6e5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.17.8
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/red-colors[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby27(-)] dev-ruby/ruby-glib2[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby27(-)] dev-ruby/ruby-poppler[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=x11-libs/cairo-1.2.0[svg(+)] ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Ruby bindings for cairo
+EAPI=8
+HOMEPAGE=https://cairographics.org/rcairo/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 doc test
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
+LICENSE=|| ( Ruby-BSD GPL-2 )
+RDEPEND=>=x11-libs/cairo-1.2.0[svg(+)] ruby_targets_ruby27? ( dev-ruby/red-colors[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/cairo-1.17.8.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=8ea3c653d30a3063a87526d72e51e0a0
diff --git a/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1 b/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1
index b856b059c41a..16a02cae3141 100644
--- a/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/red-data-tools/red-colors
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~ppc ~riscv ~x86
+KEYWORDS=amd64 ~ppc ~riscv ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/red-colors-0.3.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b67b27e095a9bf94fbf470a10a02fd5c
+_md5_=c9568ffab33f7785523ec254ab4a73c2
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.3.1 b/metadata/md5-cache/dev-ruby/regexp_parser-2.3.1
deleted file mode 100644
index 38d91d7e6a22..000000000000
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] test? ( dev-ruby/ice_nine[ruby_targets_ruby27(-)] dev-ruby/regexp_property_values[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] test? ( dev-ruby/ice_nine[ruby_targets_ruby30(-)] dev-ruby/regexp_property_values[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/rake[ruby_targets_ruby31(-)] dev-ruby/rspec:3[ruby_targets_ruby31(-)] test? ( dev-ruby/ice_nine[ruby_targets_ruby31(-)] dev-ruby/regexp_property_values[ruby_targets_ruby31(-)] dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
-EAPI=8
-HOMEPAGE=https://github.com/ammar/regexp_parser
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.3.1.tar.gz -> regexp_parser-2.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=cc6caeb2782838b9ab26e07d2d8aeb00
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.5.0 b/metadata/md5-cache/dev-ruby/regexp_parser-2.6.1
index 22fff0f87ffe..5318c372e0c0 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.5.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.6.1
@@ -12,6 +12,6 @@ RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
-SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.5.0.tar.gz -> regexp_parser-2.5.0.tar.gz
+SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.6.1.tar.gz -> regexp_parser-2.6.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c25082651af2e80d19cabbe2858eab8e
+_md5_=122d1fe4aaef0acb73684f8e21ef110b
diff --git a/metadata/md5-cache/dev-ruby/roadie-5.1.0 b/metadata/md5-cache/dev-ruby/roadie-5.1.0
new file mode 100644
index 000000000000..0ae5e78fd522
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/roadie-5.1.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby27(-)] =dev-ruby/css_parser-1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby30(-)] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby30(-)] =dev-ruby/css_parser-1*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Making HTML emails comfortable for the Rails rockstars
+EAPI=8
+HOMEPAGE=https://github.com/Mange/roadie
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby27(-)] =dev-ruby/css_parser-1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby30(-)] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby30(-)] =dev-ruby/css_parser-1*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=https://github.com/Mange/roadie/archive/v5.1.0.tar.gz -> roadie-5.1.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=003a43255ecd277c64248fcc3dcb1bce
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index e08df6a1050a..27c711aa204f 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.2.1 b/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.2.1
new file mode 100644
index 000000000000..f468faf6c86d
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.2.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-python/colorama-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt_toolkit-3.0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] full-name-executable? ( !dev-vcs/git-extras ) dev-vcs/git >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/colorama-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt_toolkit-3.0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=Command-line tool to delete merged Git branches
+EAPI=8
+HOMEPAGE=https://github.com/hartwork/git-delete-merged-branches
+INHERIT=distutils-r1
+IUSE=full-name-executable test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-python/colorama-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt_toolkit-3.0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] full-name-executable? ( !dev-vcs/git-extras ) dev-vcs/git python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/git-delete-merged-branches/git-delete-merged-branches-7.2.1.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=6e3ccf5de6a71c871eb169bd4e18988a
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 979f1d6e4328..b53dc9f69e11 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/ponysay-3.0.3 b/metadata/md5-cache/games-misc/ponysay-3.0.3
index 1a46bdc716de..81a85842ef4a 100644
--- a/metadata/md5-cache/games-misc/ponysay-3.0.3
+++ b/metadata/md5-cache/games-misc/ponysay-3.0.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/erkin/ponysay
 INHERIT=bash-completion-r1 python-single-r1
 IUSE=doc +non-free bash-completion fish-completion zsh-completion python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~m68k ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) fish-completion? ( app-shells/fish ) zsh-completion? ( app-shells/zsh )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/erkin/ponysay/archive/3.0.3.tar.gz -> ponysay-3.0.3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8bcd923bd011747981edb31377dbf6a1
+_md5_=b39ed1034aceb9f3994b0633912a85b1
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index ca2a0c39f719..0ddf2b30773d 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/rsync-9999 b/metadata/md5-cache/net-misc/rsync-9999
index 1b73a5669089..5e41e55dcc67 100644
--- a/metadata/md5-cache/net-misc/rsync-9999
+++ b/metadata/md5-cache/net-misc/rsync-9999
@@ -1,15 +1,15 @@
-BDEPEND=examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/commonmark[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/commonmark[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/commonmark[python_targets_python3_10(-)] ) 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 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) rrsync? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/commonmark[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/commonmark[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/commonmark[python_targets_python3_10(-)] ) 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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl ) lz4? ( app-arch/lz4:= ) ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( >=dev-libs/xxhash-0.8 ) zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )
+DEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl ) lz4? ( app-arch/lz4:= ) rrsync? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/bracex[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/bracex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/bracex[python_targets_python3_10(-)] ) ) ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( >=dev-libs/xxhash-0.8 ) zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )
 DESCRIPTION=File transfer program to keep remote files into sync
 EAPI=8
 HOMEPAGE=https://rsync.samba.org/
 INHERIT=prefix python-single-r1 systemd autotools git-r3
-IUSE=acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl ) lz4? ( app-arch/lz4:= ) ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( >=dev-libs/xxhash-0.8 ) zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) examples? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RDEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) examples? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-lang/perl ) lz4? ( app-arch/lz4:= ) rrsync? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/bracex[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/bracex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/bracex[python_targets_python3_10(-)] ) ) ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( >=dev-libs/xxhash-0.8 ) zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) examples? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) rrsync? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8217ce91ee3d298c555fd6245eb90302
+_md5_=159bde66e8ec6ca9ae7a424c0567aa36
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index ed8408975e8f..adb939bfe144 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.11.2-r1 b/metadata/md5-cache/sci-mathematics/coq-8.11.2-r1
deleted file mode 100644
index 8536c5a3efca..000000000000
--- a/metadata/md5-cache/sci-mathematics/coq-8.11.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-ml/camlp5:=[ocamlopt?] || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk? ( dev-ml/lablgtk:3=[sourceview,ocamlopt?] dev-ml/lablgtk-sourceview:3=[ocamlopt?] ) dev-ml/findlib doc? ( media-libs/netpbm[png,postscript(+),zlib(+)] virtual/latex-base dev-tex/hevea dev-texlive/texlive-latexrecommended dev-texlive/texlive-pictures dev-texlive/texlive-mathscience dev-texlive/texlive-latexextra )
-DESCRIPTION=Proof assistant written in O'Caml
-EAPI=7
-HOMEPAGE=http://coq.inria.fr/
-INHERIT=desktop multilib
-IUSE=gtk debug +ocamlopt doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-ml/camlp5:=[ocamlopt?] || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk? ( dev-ml/lablgtk:3=[sourceview,ocamlopt?] dev-ml/lablgtk-sourceview:3=[ocamlopt?] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/coq/coq/archive/V8.11.2.tar.gz -> coq-8.11.2.tar.gz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5836a25a10b5cace312d5498dca2bab6
diff --git a/metadata/md5-cache/sci-mathematics/why3-for-spark-2019-r2 b/metadata/md5-cache/sci-mathematics/why3-for-spark-2019-r2
index f26899bd2c30..54c569999638 100644
--- a/metadata/md5-cache/sci-mathematics/why3-for-spark-2019-r2
+++ b/metadata/md5-cache/sci-mathematics/why3-for-spark-2019-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=dev-ml/ocamlbuild-0.14.0 <=dev-ml/menhir-20190924:= dev-ml/num:= coq? ( >=sci-mathematics/coq-8.9.1 ) doc? ( dev-tex/rubber ) gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] ) emacs? ( >=app-editors/emacs-23.1:* ) html? ( dev-tex/hevea:= ) hypothesis-selection? ( dev-ml/ocamlgraph:= ) zarith? ( dev-ml/zarith:= ) zip? ( >=dev-ml/camlzip-1.07:= )
+DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=dev-ml/ocamlbuild-0.14.0 <=dev-ml/menhir-20190924:= dev-ml/num:= doc? ( dev-tex/rubber ) gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] ) emacs? ( >=app-editors/emacs-23.1:* ) html? ( dev-tex/hevea:= ) hypothesis-selection? ( dev-ml/ocamlgraph:= ) zarith? ( dev-ml/zarith:= ) zip? ( >=dev-ml/camlzip-1.07:= )
 DESCRIPTION=Platform for deductive program verification
 EAPI=7
 HOMEPAGE=https://why3.lri.fr/
-IUSE=coq doc emacs gtk html hypothesis-selection +ocamlopt zarith zip
+IUSE=doc emacs gtk html hypothesis-selection +ocamlopt zarith zip
 KEYWORDS=amd64
 LICENSE=GPL-3
-RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=dev-ml/ocamlbuild-0.14.0 <=dev-ml/menhir-20190924:= dev-ml/num:= coq? ( >=sci-mathematics/coq-8.9.1 ) doc? ( dev-tex/rubber ) gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] ) emacs? ( >=app-editors/emacs-23.1:* ) html? ( dev-tex/hevea:= ) hypothesis-selection? ( dev-ml/ocamlgraph:= ) zarith? ( dev-ml/zarith:= ) zip? ( >=dev-ml/camlzip-1.07:= )
+RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=dev-ml/ocamlbuild-0.14.0 <=dev-ml/menhir-20190924:= dev-ml/num:= doc? ( dev-tex/rubber ) gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] ) emacs? ( >=app-editors/emacs-23.1:* ) html? ( dev-tex/hevea:= ) hypothesis-selection? ( dev-ml/ocamlgraph:= ) zarith? ( dev-ml/zarith:= ) zip? ( >=dev-ml/camlzip-1.07:= )
 REQUIRED_USE=html? ( doc )
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf915d31e87a8f1c967d54 -> why3-2019-20190517-197BB-src.tar.gz
-_md5_=0c2c824ca38e94be97171db2ec1365bd
+_md5_=266f1e4d893cb53dcea0604b4bff902c
diff --git a/metadata/md5-cache/sci-mathematics/why3-for-spark-2020 b/metadata/md5-cache/sci-mathematics/why3-for-spark-2020
index 17277a796120..001384188924 100644
--- a/metadata/md5-cache/sci-mathematics/why3-for-spark-2020
+++ b/metadata/md5-cache/sci-mathematics/why3-for-spark-2020
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=dev-ml/ocamlbuild-0.14.0 dev-ml/menhir:= <dev-ml/num-1.4:= dev-ml/yojson:= coq? ( >=sci-mathematics/coq-8.9.1 <sci-mathematics/coq-8.12 ) doc? ( dev-tex/rubber dev-python/sphinx media-gfx/graphviz dev-python/sphinxcontrib-bibtex ) gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] ) emacs? ( >=app-editors/emacs-23.1:* ) html? ( dev-tex/hevea:= ) zarith? ( dev-ml/zarith:= ) zip? ( >=dev-ml/camlzip-1.07:= )
+DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=dev-ml/ocamlbuild-0.14.0 dev-ml/menhir:= <dev-ml/num-1.4:= dev-ml/yojson:= doc? ( dev-tex/rubber dev-python/sphinx media-gfx/graphviz dev-python/sphinxcontrib-bibtex ) gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] ) emacs? ( >=app-editors/emacs-23.1:* ) html? ( dev-tex/hevea:= ) zarith? ( dev-ml/zarith:= ) zip? ( >=dev-ml/camlzip-1.07:= )
 DESCRIPTION=Platform for deductive program verification
 EAPI=7
 HOMEPAGE=https://why3.lri.fr/
 INHERIT=autotools
-IUSE=coq doc emacs gtk html +ocamlopt zarith zip
+IUSE=doc emacs gtk html +ocamlopt zarith zip
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=dev-ml/ocamlbuild-0.14.0 dev-ml/menhir:= <dev-ml/num-1.4:= dev-ml/yojson:= coq? ( >=sci-mathematics/coq-8.9.1 <sci-mathematics/coq-8.12 ) doc? ( dev-tex/rubber dev-python/sphinx media-gfx/graphviz dev-python/sphinxcontrib-bibtex ) gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] ) emacs? ( >=app-editors/emacs-23.1:* ) html? ( dev-tex/hevea:= ) zarith? ( dev-ml/zarith:= ) zip? ( >=dev-ml/camlzip-1.07:= )
+RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=dev-ml/ocamlbuild-0.14.0 dev-ml/menhir:= <dev-ml/num-1.4:= dev-ml/yojson:= doc? ( dev-tex/rubber dev-python/sphinx media-gfx/graphviz dev-python/sphinxcontrib-bibtex ) gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] ) emacs? ( >=app-editors/emacs-23.1:* ) html? ( dev-tex/hevea:= ) zarith? ( dev-ml/zarith:= ) zip? ( >=dev-ml/camlzip-1.07:= )
 REQUIRED_USE=html? ( doc )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/8bb5801e17b8b23453262da69c981c091959eec7?filename=why3-2020-20200429-199EF-src.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c9e5afa522f8582561a3c88cce691574
+_md5_=bf06db847837f73e72ebff9f16ab469f
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 7994cf95e872..30b765365838 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/bindfs-1.17.1 b/metadata/md5-cache/sys-fs/bindfs-1.17.1
new file mode 100644
index 000000000000..3157406f9d19
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/bindfs-1.17.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=>=sys-fs/fuse-3.10.2:3 virtual/pkgconfig
+DESCRIPTION=FUSE filesystem for bind mounting with altered permissions
+EAPI=8
+HOMEPAGE=https://bindfs.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-fs/fuse-3.10.2:3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://bindfs.org/downloads/bindfs-1.17.1.tar.gz
+_md5_=6a4bf3eea3d5656e135a6afb03fb2ee3
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 10922159a351..61d9f669f6cd 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.80 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.80
new file mode 100644
index 000000000000..85bc52a940f8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.80
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.80
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.80 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.80
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-84.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-84.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	556e93c4ddc2e0c5dfa8d7ec5193fa5c	kernel-install	238be8d2f82d53a648a5905b57a4969b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=467badd8045b484dbd655f59e5c28461
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.10 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.10
new file mode 100644
index 000000000000..15caf663cb75
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.10
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.0.10
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.0.10 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.0.10
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-10.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.8-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.8-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.8-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.8-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	556e93c4ddc2e0c5dfa8d7ec5193fa5c	kernel-install	238be8d2f82d53a648a5905b57a4969b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=0b2e7cc67d01f528cad9536cb815d185
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.80 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.80
new file mode 100644
index 000000000000..291387f68341
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.80
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.80
+RDEPEND=!sys-kernel/gentoo-kernel:5.15.80 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.80
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-84.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-84.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80-1.gpkg.tar -> gentoo-kernel-5.15.80-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80-1.gpkg.tar -> gentoo-kernel-5.15.80-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80-1.gpkg.tar -> gentoo-kernel-5.15.80-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80-1.gpkg.tar -> gentoo-kernel-5.15.80-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	238be8d2f82d53a648a5905b57a4969b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
+_md5_=6415db1b5b031c70d1be802ca1cc9fa3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.10 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.10
new file mode 100644
index 000000000000..ebd6d4191ee2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.10
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.0.10
+RDEPEND=!sys-kernel/gentoo-kernel:6.0.10 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.0.10
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-10.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.10-1.gpkg.tar -> gentoo-kernel-6.0.10-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.10-1.gpkg.tar -> gentoo-kernel-6.0.10-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.10-1.gpkg.tar -> gentoo-kernel-6.0.10-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.10-1.gpkg.tar -> gentoo-kernel-6.0.10-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	238be8d2f82d53a648a5905b57a4969b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
+_md5_=eb9fbacf88abe54387f9a9102bc75091
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.80 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.80
new file mode 100644
index 000000000000..e46dabf1ad05
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.80
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.80
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.80
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.80.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.80.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	556e93c4ddc2e0c5dfa8d7ec5193fa5c	kernel-install	238be8d2f82d53a648a5905b57a4969b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=3e4f9b1f2db82487ca5d21a388b5ee08
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.10 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.10
new file mode 100644
index 000000000000..cffda72d6a62
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.10
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.0.10
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.0.10
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.10.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.10.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.8-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.8-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.8-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.8-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	556e93c4ddc2e0c5dfa8d7ec5193fa5c	kernel-install	238be8d2f82d53a648a5905b57a4969b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=31d6897273d3b5f74a16a66407e06f23
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index fd45cc375e8e..6df9ee539026 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.80 b/metadata/md5-cache/virtual/dist-kernel-5.15.80
new file mode 100644
index 000000000000..cc489b292e99
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.15.80
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.80 ~sys-kernel/gentoo-kernel-bin-5.15.80 ~sys-kernel/vanilla-kernel-5.15.80 )
+SLOT=0/5.15.80
+_md5_=8d5178e82e5992dcec134c02ff7397e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.0.10 b/metadata/md5-cache/virtual/dist-kernel-6.0.10
new file mode 100644
index 000000000000..2f45005e3668
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.0.10
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.0.10 ~sys-kernel/gentoo-kernel-bin-6.0.10 ~sys-kernel/vanilla-kernel-6.0.10 )
+SLOT=0/6.0.10
+_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 132a855de149..659b6d7ecc28 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/apache-2.4.54-r6 b/metadata/md5-cache/www-servers/apache-2.4.54-r6
index 3cdaddd3a631..a38bf054f804 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.54-r6
+++ b/metadata/md5-cache/www-servers/apache-2.4.54-r6
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://httpd.apache.org/
 INHERIT=apache-2 systemd tmpfiles toolchain-funcs
 IUSE=lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ssl debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog split-usr threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_auth_form apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authn_socache apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers +apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_lua apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_hcheck apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_uwsgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_session apache2_modules_session_cookie apache2_modules_session_crypto apache2_modules_session_dbd apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_socache_memcache apache2_modules_socache_shmcb apache2_modules_speling apache2_modules_status apache2_modules_substitute systemd apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.54
 RDEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) virtual/tmpfiles
@@ -14,4 +14,4 @@ REQUIRED_USE=apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !t
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.54.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
 _eclasses_=apache-2	1e3ed39835f0152a076c040454918d0c	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=64ceb3d97ecedc81ca1ca4a15643961d
+_md5_=92ee1a93af3f84b01fc644ee41816d5b
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 658a580124f8..6c1488fb900f 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.8-r4 b/metadata/md5-cache/x11-libs/motif-2.3.8-r4
index d3dee21a3578..b4ebc1485d09 100644
--- a/metadata/md5-cache/x11-libs/motif-2.3.8-r4
+++ b/metadata/md5-cache/x11-libs/motif-2.3.8-r4
@@ -10,6 +10,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~
 LICENSE=LGPL-2.1+ MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-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(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=media-libs/libjpeg-turbo-1.5.3-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(-)?] ) png? ( >=media-libs/libpng-1.6.10: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(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[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/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.8%20Source%20Code/motif-2.3.8.tar.gz https://dev.gentoo.org/~ulm/distfiles/motif-2.3.8-patches-3.tar.xz
+SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.8%20Source%20Code/motif-2.3.8.tar.gz https://dev.gentoo.org/~ulm/distfiles/motif-2.3.8-patches-4.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c32baa75ee9dae6f4ebc7186d20d6ce4
+_md5_=c3c64bad4555d1a4a8c90e6452a0ad9e
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index f1bb1a8a0e6c..2de7b0eae615 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/grub2-theme-preview-2.7.0 b/metadata/md5-cache/x11-misc/grub2-theme-preview-2.7.0
new file mode 100644
index 000000000000..f1c7cbf1fbd1
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/grub2-theme-preview-2.7.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( app-emulation/qemu dev-libs/libisoburn sys-fs/mtools grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_efi-64] sys-firmware/edk2-ovmf ) !grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_pc] ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=Preview a GRUB 2.x theme using KVM/QEMU
+EAPI=8
+HOMEPAGE=https://github.com/hartwork/grub2-theme-preview
+INHERIT=distutils-r1
+IUSE=grub_platforms_efi-64 test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-emulation/qemu dev-libs/libisoburn sys-fs/mtools grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_efi-64] sys-firmware/edk2-ovmf ) !grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_pc] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hartwork/grub2-theme-preview/archive/2.7.0.tar.gz -> grub2-theme-preview-2.7.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=652bf76313c8aecf443cfc9a2fba987a
diff --git a/metadata/md5-cache/x11-misc/xvfb-run-1.20.10_p2 b/metadata/md5-cache/x11-misc/xvfb-run-1.20.10_p2
deleted file mode 100644
index 96e267c66d41..000000000000
--- a/metadata/md5-cache/x11-misc/xvfb-run-1.20.10_p2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-util/patchutils
-DESCRIPTION=Run a command in a virtual X server environment
-EAPI=7
-HOMEPAGE=https://packages.debian.org/sid/xvfb
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=x11-apps/xauth x11-base/xorg-server[xvfb]
-SLOT=0
-SRC_URI=mirror://debian/pool/main/x/xorg-server/xorg-server_1.20.10-2.diff.gz
-_md5_=04e1b5c72ae4481cb1a90212b2934d98
diff --git a/metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2 b/metadata/md5-cache/x11-misc/xvfb-run-21.1.4.3
index 1c1d8050ec19..93f655784ced 100644
--- a/metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2
+++ b/metadata/md5-cache/x11-misc/xvfb-run-21.1.4.3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install prepare
 DEPEND=dev-util/patchutils
 DESCRIPTION=Run a command in a virtual X server environment
-EAPI=7
+EAPI=8
 HOMEPAGE=https://packages.debian.org/sid/xvfb
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=x11-apps/xauth x11-base/xorg-server[xvfb]
 SLOT=0
-SRC_URI=mirror://debian/pool/main/x/xorg-server/xorg-server_1.20.8-2.diff.gz
-_md5_=a30e5a6048d137ec0454d2723857d1ee
+SRC_URI=mirror://debian/pool/main/x/xorg-server/xorg-server_21.1.4-3.diff.gz
+_md5_=24ded437848b74fba2d6c0fa8ebdd960
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index e3abde35d877..e39636369f7a 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.16.0 b/metadata/md5-cache/xfce-base/libxfce4util-4.16.0
index 563d2d41aafc..d867de2c1fc6 100644
--- a/metadata/md5-cache/xfce-base/libxfce4util-4.16.0
+++ b/metadata/md5-cache/xfce-base/libxfce4util-4.16.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install prepare
 DEPEND=>=dev-libs/glib-2.50 introspection? ( dev-libs/gobject-introspection:= )
 DESCRIPTION=A basic utility library for the Xfce desktop environment
 EAPI=7
-HOMEPAGE=https://git.xfce.org/xfce/libxfce4util/
+HOMEPAGE=https://docs.xfce.org/xfce/libxfce4util/start https://gitlab.xfce.org/xfce/libxfce4util/
 INHERIT=vala
 IUSE=+introspection vala
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
@@ -13,4 +13,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0/7
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4util/4.16/libxfce4util-4.16.0.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=68873ea1420570305c4e8fcce9a8baf2
+_md5_=ab33340a589e8bd1de0ba863d86145b4
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.17.2 b/metadata/md5-cache/xfce-base/libxfce4util-4.17.2
index 171860b39fa9..27761a5ce66e 100644
--- a/metadata/md5-cache/xfce-base/libxfce4util-4.17.2
+++ b/metadata/md5-cache/xfce-base/libxfce4util-4.17.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install
 DEPEND=>=dev-libs/glib-2.56 introspection? ( dev-libs/gobject-introspection:= )
 DESCRIPTION=A basic utility library for the Xfce desktop environment
 EAPI=8
-HOMEPAGE=https://git.xfce.org/xfce/libxfce4util/
+HOMEPAGE=https://docs.xfce.org/xfce/libxfce4util/start https://gitlab.xfce.org/xfce/libxfce4util/
 INHERIT=vala
 IUSE=+introspection vala
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
@@ -13,4 +13,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0/7
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4util/4.17/libxfce4util-4.17.2.tar.bz2
 _eclasses_=vala	160a8a30a6cb9aa601e5441c643a7c61
-_md5_=862d1405230b1086b79bc65f4198aea7
+_md5_=6e2748e7e3aa9d87d571c6e5511ec181
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 94bd1e4a303f..3d23d7108a7b 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.13 b/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.13
index ff7abaa34aee..3570d355b8ba 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.13
+++ b/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.13
@@ -2,7 +2,7 @@ BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_
 DEFINED_PHASES=configure postinst postrm setup
 DESCRIPTION=Simple application to manage Xfce panel layouts
 EAPI=7
-HOMEPAGE=https://git.xfce.org/apps/xfce4-panel-profiles/about/
+HOMEPAGE=https://docs.xfce.org/apps/xfce4-panel-profiles/start https://gitlab.xfce.org/apps/xfce4-panel-profiles/
 INHERIT=python-single-r1 xdg-utils
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~riscv ~x86
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-panel-profiles/1.0/xfce4-panel-profiles-1.0.13.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=19962b7bb905e0cfe5736e17af7a9ba6
+_md5_=6950c348f64c7f141422bda5278cf52e
diff --git a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.5 b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.5
index 5a6f05365821..42080102b082 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.5
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst postrm
 DEPEND=>=dev-libs/glib-2.42.0 media-sound/pulseaudio:=[glib] >=x11-libs/gtk+-3.20.0:3 >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.9.0:= >=xfce-base/xfce4-panel-4.11.0:= >=xfce-base/xfconf-4.6.0:= keybinder? ( dev-libs/keybinder:3 ) libcanberra? ( media-libs/libcanberra ) libnotify? ( x11-libs/libnotify ) wnck? ( x11-libs/libwnck:3 )
 DESCRIPTION=A panel plug-in for PulseAudio volume control
 EAPI=8
-HOMEPAGE=https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/
+HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/
 INHERIT=xdg-utils
 IUSE=+keybinder libcanberra libnotify wnck
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/glib-2.42.0 media-sound/pulseaudio:=[glib] >=x11-libs/gtk+-3.
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.5.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fcc0260bfbd2f7e3e6cf5c2746c7b452
+_md5_=303692ffd6a85752d5a898837ea6a70f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.16.0 b/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.16.0
index 7095f253e457..b182d99d63f8 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.16.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.16.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst postrm
 DEPEND=>=dev-libs/dbus-glib-0.30 >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.20:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= elogind? ( sys-auth/elogind ) locking? ( pam? ( sys-libs/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
 DESCRIPTION=Screen saver and locker (port of MATE screensaver)
 EAPI=7
-HOMEPAGE=https://git.xfce.org/apps/xfce4-screensaver/about/
+HOMEPAGE=https://docs.xfce.org/apps/screensaver/start https://gitlab.xfce.org/apps/xfce4-screensaver/
 INHERIT=xdg-utils
 IUSE=elogind +locking opengl pam systemd
 KEYWORDS=~alpha amd64 arm ~arm64 ~loong ppc ~ppc64 ~riscv x86
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/dbus-glib-0.30 >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/4.16/xfce4-screensaver-4.16.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=242ff36fa58482c8143eb14f04fffbf3
+_md5_=acbfcb2b3066ded85178342b6adf11f2
diff --git a/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3 b/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3
index 4e965aeb0537..a1f9baa20251 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure
 DEPEND=>=dev-libs/glib-2.16:2= dev-libs/keybinder:3= >=media-sound/pulseaudio-0.9.19:=[glib] >=x11-libs/gtk+-3.20:3= >=xfce-base/xfconf-4.8:= libnotify? ( x11-libs/libnotify:= )
 DESCRIPTION=Daemon to control volume up/down and mute keys for pulseaudio
 EAPI=7
-HOMEPAGE=https://git.xfce.org/apps/xfce4-volumed-pulse/
+HOMEPAGE=https://gitlab.xfce.org/apps/xfce4-volumed-pulse/
 IUSE=libnotify
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16:2= dev-libs/keybinder:3= >=media-sound/pulseaudio-0.9.19:=[glib] >=x11-libs/gtk+-3.20:3= >=xfce-base/xfconf-4.8:= libnotify? ( x11-libs/libnotify:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-volumed-pulse/0.2/xfce4-volumed-pulse-0.2.3.tar.bz2
-_md5_=85eb6fbeab6e78e66f670317c7092f98
+_md5_=ba6135c23c60dfdb7d126918aa764fd7
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 2591cdbf01fb..7f1d739b93db 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14421 BLAKE2B 0f41c59983421c5a874774c72cee0a539dbe67328a99d7b3fac34e629fe17a797572a6b288edfdc1f7afe68fd982ecb7741c2b1e7518c31f7e22823346ffd70c SHA512 01aefa27769efd4db47e7c9ce0eb916aca94e3d3d3bcec5a340337270c8e62665b5495397e431cbd07b9e15c6be0b763e01adfdfd12745a3d8ebdd2e0a2d782a
-TIMESTAMP 2022-11-26T12:39:51Z
+TIMESTAMP 2022-11-26T18:39:51Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOCCRdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOCXXdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC9QhAAsa5Up/re5MOMLIpZ7YAIRPveTzaKUH7F4KZ7SpmodOX/JCn/LBkBSFK4
-krYVyzF27F5gpGGgyRn+FsgatN7UbSWZBMva51+D+W9xreZwRN1KLhv+E2BA9nsr
-XonQFLUFWe+28CMQWFXQ19Kl6Tzdd+f0TrvASH9VTJU27x+8qSa8yW8yv+eLhMRc
-LDtgWakIKTR5uMUZqgbtE7/uhTN0xXAdtaM/pzVKmDSz+efmU3xbgzGBEwbifVnk
-m1qaSDYVFM41GEt9a6Sx8VxOqyUHDtvx7X2emLswwfjqECLe1gVHLWuyTSQ8DhkW
-7MEOthrgnLSUkqdQIIJYVMmsULRCOJkp6lHGyWJfybM7kBQwNhFWP+EQishd+N9E
-bn4JCFESj5x3rUYg3/8mwwK54/VhLj4O6iAEf30Tlm+IKfTF/kaa+Kgm0KEeaEbC
-PJ2MsbUMDMRvHGN0ApbcVFPb4c0Z4Arz08R7+qpJK7yhh9Ib+nPEU4hI9mjr1MrH
-k5mfHR5jr6fVMOktFR0ddQ1sZJMq7JqWQip2IpenhUrs2WPs+ZrHGN67pvo6hyqs
-41TT/+es2HEiddrm35lT49Q0Swe0cgpoN/DbisdcrU3cddMcP8OtgYlCAwdYHBm3
-Odb2IrMx3HsFL4E6t9a5BN+VpQklxsw3E95v/BNjPWACetuNuxc=
-=KwyH
+klDyMxAAj47KbF820IlrsCzzUB7SbK5OxNuvXJIfjasDOZzFbcV71v4+rjIzgudO
+0ol5fbGjlHZA4uMpxU6A8mKye5gf1Fp0lxytBmft4N/gpcHYwqQKaOwkH3KGxN/F
+M2o6OCrdCLYw0FF/jLihGu8w0YkyPfXdtzvAa2u5Qgpt4Wa4+j2pfyKFMxJAH7nq
+xSy48Df99xsdR+6FC5UK/Qzby70BgryE0Jb8+Bz+MQE/EaBuxAiNuyJ6G21a2D96
+ZVZNlGNzH9jVmQZXUyssWlzbp+rNSomjGKaKaOcTnQYeIK9kZtlQH9ZOMi+a/l6P
+fvhAbapIMZyhFZDpx14ngX/c/UKWEYz5iyQ39gfHRB4rhmgeXLcDjygAy0z3m22q
+uaeuNeLKRlbAVQIwUz5XvMIbxoiRAhBKxPC1Q0iwQag264oR4SwzB270CfsuZrZ5
+sPESpQizU+iGaUleW3FzpQD5gRavsOGdQZ36wvGsNBGFszPRVki4137MFLDNhISw
+BnrXft20f7Vpp7yI1dF7c2NFtD+3bCuPVRYA9O9UqOqMut2OyUuQ3zWjwTuVWdiJ
+uErDOc+4VOh57zvXt/KoWoR9l/pToesjZx0RMtcTrjM67V+oivVIV4P5dFUiaUxc
+/+7tlxoZhXSCcOmoV/zEEP16DeDK1UXZz+tYLdxK0StOJsPKlLI=
+=POc2
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f274ea470811..d895e658b5ce 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 26 Nov 2022 12:39:47 +0000
+Sat, 26 Nov 2022 18:39:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 44d213353f22..b9cafb138b02 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Nov 26 12:39:47 PM UTC 2022
+Sat Nov 26 06:39:47 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index cb8d091fb29b..7def57f46c59 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 26 Nov 2022 12:45:01 +0000
+Sat, 26 Nov 2022 18:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 41a142a45888..69c900000d91 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9938a9f418166aac77505654f75ea83e83c64e5c 1669465126 2022-11-26T12:18:46+00:00
+078081bb23bfaa7ee50334488c8b83b86dbf09d2 1669486656 2022-11-26T18:17:36+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c755847d27a9..bd3fc1758185 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1669466401 Sat 26 Nov 2022 12:40:01 PM UTC
+1669488001 Sat 26 Nov 2022 06:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f274ea470811..d895e658b5ce 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 26 Nov 2022 12:39:47 +0000
+Sat, 26 Nov 2022 18:39:48 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6125aa0f513f..0735d12c98d0 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index b206b097715d..80681fd9bd24 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -14,5 +14,5 @@ DIST rsync-3.2.7.tar.gz.asc 195 BLAKE2B d2bca9276d9a0c96a9156a8da60e391f58eceb2e
 EBUILD rsync-3.2.4-r3.ebuild 4766 BLAKE2B 2c5a0c4bd2f5f600cec463fe3d5a41cd4f9908ec5ead8e19a52a29108ad25be43cb6da3eb3f04fb0aafb9efb0bcc33e66d6b6f3450ce59a922d21db533d5f87d SHA512 482dee5328c886e9103a4d0a7d05e7bb258f12093f2dd530eef427714dd7f80ffbff821c4104783c066a7178efbe46da7d86101d74fb094c46f32ee411db22d2
 EBUILD rsync-3.2.6.ebuild 4515 BLAKE2B 89f5ad14e0dd506830dae96014566274a70b09b8d66215174dbe15c609075e2cdb179f83b20acde4170bd0c9b2707fa1e9b81a5bd6792d7913f60c5ece06532e SHA512 ebf536d851b3da99859f080e322147ac3438e90b06ea01148698bd22b4269ba4ccd84fc8b7217188010ab8e20ce3f92ff86a245de4aa7013ba500a93b620faf8
 EBUILD rsync-3.2.7-r1.ebuild 5180 BLAKE2B 9d7fb2cfe0c2ce4bc7beca2fbed0cd5416c5bc0be66a1044b5878ca8cde0ddd18d9100dd283bc46c071a6c8d7e1fad5d0895e4f0cf4a68b52df9f76bc30aa5f0 SHA512 eb2bd26bdc0b5b61278e126db46df883c746758273825436b43d05d377bf2aa8ca9b74aac0667560c2b3843d4eef9c7b42a55c4d80062f1291834db04c190a2b
-EBUILD rsync-9999.ebuild 4515 BLAKE2B 89f5ad14e0dd506830dae96014566274a70b09b8d66215174dbe15c609075e2cdb179f83b20acde4170bd0c9b2707fa1e9b81a5bd6792d7913f60c5ece06532e SHA512 ebf536d851b3da99859f080e322147ac3438e90b06ea01148698bd22b4269ba4ccd84fc8b7217188010ab8e20ce3f92ff86a245de4aa7013ba500a93b620faf8
+EBUILD rsync-9999.ebuild 5180 BLAKE2B 9d7fb2cfe0c2ce4bc7beca2fbed0cd5416c5bc0be66a1044b5878ca8cde0ddd18d9100dd283bc46c071a6c8d7e1fad5d0895e4f0cf4a68b52df9f76bc30aa5f0 SHA512 eb2bd26bdc0b5b61278e126db46df883c746758273825436b43d05d377bf2aa8ca9b74aac0667560c2b3843d4eef9c7b42a55c4d80062f1291834db04c190a2b
 MISC metadata.xml 880 BLAKE2B b079b9b9cb5dcc93b50d49fa50723729b7c57c34ad0cdfd946821089a1f9788a460818cef8d6a4e9f603ad066f6b3a0c22c7becb950abc1eac8e2923adf18bac SHA512 215f0df65f53e2aca8d519c85111f87e95d592454b8a297f69058c1d87ff5650f32f3c937715c8a83dc9bef1ca1e70589cd3797ca595688806c1067462717c14
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index 804909ae11e6..6c31cf7b857f 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -37,8 +37,9 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd"
+IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd"
 REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	>=dev-libs/popt-1.5
@@ -48,6 +49,12 @@ RDEPEND="
 		dev-lang/perl
 	)
 	lz4? ( app-arch/lz4:= )
+	rrsync? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/bracex[${PYTHON_USEDEP}]
+		')
+	)
 	ssl? ( dev-libs/openssl:= )
 	system-zlib? ( sys-libs/zlib )
 	xattr? ( kernel_linux? ( sys-apps/attr ) )
@@ -55,7 +62,10 @@ RDEPEND="
 	zstd? ( >=app-arch/zstd-1.4:= )
 	iconv? ( virtual/libiconv )"
 DEPEND="${RDEPEND}"
-BDEPEND="examples? ( ${PYTHON_DEPS} )"
+BDEPEND="
+	examples? ( ${PYTHON_DEPS} )
+	rrsync? ( ${PYTHON_DEPS} )
+"
 
 if [[ ${PV} == *9999 ]] ; then
 	BDEPEND+=" ${PYTHON_DEPS}
@@ -69,7 +79,7 @@ fi
 pkg_setup() {
 	# - USE=examples needs Python itself at runtime, but nothing else
 	# - 9999 needs commonmark at build time
-	if [[ ${PV} == *9999 ]] || use examples ; then
+	if [[ ${PV} == *9999 ]] || use examples || use rrsync; then
 		python-single-r1_pkg_setup
 	fi
 }
@@ -82,6 +92,17 @@ src_prepare() {
 		eautoconf -o configure.sh
 		eautoheader && touch config.h.in
 	fi
+
+	if use examples || use rrsync; then
+		python_fix_shebang support/
+	fi
+
+	if [[ -f rrsync.1 ]]; then
+		# If the pre-build rrsync.1 man page exists, then link to it
+		# from support/rrsync.1 to avoid rsync's build system attempting
+		# re-creating the man page (bug #883049).
+		ln -s ../rrsync.1 support/rrsync.1 || die
+	fi
 }
 
 src_configure() {
@@ -92,6 +113,7 @@ src_configure() {
 		$(use_enable acl acl-support)
 		$(use_enable iconv)
 		$(use_enable lz4)
+		$(use_with rrsync)
 		$(use_enable ssl openssl)
 		$(use_with !system-zlib included-zlib)
 		$(use_enable xattr xattr-support)
@@ -126,7 +148,9 @@ src_install() {
 
 	# Install the useful contrib scripts
 	if use examples ; then
-		python_fix_shebang support/
+		# The 'rrsync' script is installed conditionally via the 'rrysnc'
+		# USE flag, and not via the 'examples' USE flag.
+		rm support/rrsync* || die
 
 		exeinto /usr/share/rsync
 		doexe support/*
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b6f4dc651f4b..7849e9209390 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index cb7d8af0c533..8b624f9c73dc 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -69,7 +69,6 @@ dev-libs/ocl-icd
 # app-cdr/xbiso: bug #882089, last release in 2005
 # app-emulation/dlx: bug #874933, last release in 2001
 # app-office/sc: bug #877051, last release in 2002
-# app-text/uudeview: bug #882505, last release in 2004
 # net-libs/ortp: bug #874003, last bumped in 2014
 # net-nntp/brag: revdep of app-text/uudeview
 # net-vpn/vtun: bug #875443, last bumped in 2012, last release in 2016
@@ -81,7 +80,6 @@ dev-libs/ocl-icd
 app-cdr/xbiso
 app-emulation/dlx
 app-office/sc
-app-text/uudeview
 net-libs/ortp
 net-nntp/brag
 net-vpn/vtun
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 772ddfe6d8b7..42207a596086 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index d15b2c8ccdfe..bb0b94dd5ee1 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,10 +1,8 @@
-DIST coq-8.11.2.tar.gz 6564523 BLAKE2B 37ae7a1f899b8ce662d5c21542b2bec0e2e8f25e976fb46689e0eae182fa4ec571524ae9f4f1a5ebbd44966fbdc4ee10cffda59c287d51ab48df4ac0e5e6844c SHA512 f8ab307b8e39ffda5f6984e187c1f8de1cb6dec5c322726dbbe535ee611683cfeeb9cee3e11ad83f5e44e843fc51e7e2d50b4ea69ab42fde38aaf3d0cf2dea3c
 DIST coq-8.12.0.tar.gz 6774001 BLAKE2B dc1d6adf9d4bd50d46007fbf5fd43d1ea97b6b226d89ad943419d4cb7df1439950c94b5e3cc614eb789103d1ab50535909d4ba2079eafc2caa4fd91db30e747d SHA512 8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240
 DIST coq-8.13.0.tar.gz 7010242 BLAKE2B bf9ec96b6698a2371be3164f65424a8ffb273252afc05e046267cae4265c1be71f89d0345f9e40ab3a93f5063080fd0224502cc0de808c7a0ddbb0edacab5fca SHA512 c355f0a9183f3669debd5f8f4ab96786215d0cccc37d1c2ac95a2d3c6115c8b0ee7ff7e23464b18444e2648ef3f8c221f0f3a28acf91199751cea2b74ee3fe8e
 DIST coq-8.15.2.tar.gz 7222794 BLAKE2B 2f187982a56cb0a512af838ee321b245f9a44b0c32f5413aafcef8e5b7f933e9b05ba521c3e681a6c6973ca2b7ec5965a8b69b2febb978ce7cf246755187f656 SHA512 6a5487912dedb6e54145bf3f177a091cffe13429ba2f73db7c1cc241fe10e86340c968e19cefba7d680facce55f4e914cbd16a317264b109a6f9a01ec822a8c5
 DIST coq-8.16.0.tar.gz 7397421 BLAKE2B 25b94002c4d1d1266ef948f0276df74d6a60c5b5100c7126232e0e33642be3ec14f33acfff5d0d5c17681676338374f694ca7c8c35200e522e480c3791f69dd8 SHA512 f324b68efcec0680a52c92d6e2fdd340a0e360e7d56d7fc3b4b781af3bec923d2fa2fdbb139b07d2253568a657a09c0d3da4cd5bdf984a6ab913e606056df4b3
 DIST coq-8.16.1.tar.gz 7401345 BLAKE2B fa6bbcd6b4ee29feaf7475f58193209afeae0bf8b6e3640f2f1cf40dfcee7d7f1fb3f371e8790b8d11c993b5f234e9175f1f5036a7286b7c6569720ddd3985f7 SHA512 e9c82f1a180c2e3946628e8e039999a1841397a5b4cd77f158de69876fa43b5c0f61ce76c510cc2b2f646a489110aea59da452b88ddd7850d1eab4105f1382f5
-EBUILD coq-8.11.2-r1.ebuild 1845 BLAKE2B 2d6bbe0787ce45b4e5130d3e9d3ec61f527fc72f2f9dfef15180ca3dbc1f46f34e7cd847c580df16a8affa97e9430e1fd045a14c4dd3bd02bc52c67d1211c55f SHA512 b39833afcbb6e33a7917f949258e91a1a11229ed68427644f80ce84a00b7254a17d8e6e41c6d778184e54c6d8928ff62cc840eee77239feea5cbc12dd3731972
 EBUILD coq-8.12.0-r2.ebuild 1847 BLAKE2B 57496afca08cfde63635e873dc6d59d32356daa211d8a140820e07398f54bb38c114ac5ae5ad7ad101a6514117dc469783d3964aae18b27a54b18330087e5f49 SHA512 84fee1004970f88cfccc28717d75fad765dbe8b27ac7dae964e5729e47727f846ac69417bb5c585a68668396896c52a5f8421dbf77e73065d8ac7b9793f4900f
 EBUILD coq-8.13.0-r1.ebuild 1821 BLAKE2B 785a17783ee06916fa171449aebc1e54437f878656862e3cec93f1499097e80b57994e37dc597ff571dbe5d45fc19b984e1d10baf8b0b61e2a7c8cfd6b851d35 SHA512 e35a981b036d089afe934a9bcfc96da2d965fa17b8c90e38b8fe2194f9aaf1b693ceead2b26e77c1e4ee4ae23124bcba9aafdb6f17c5fa5ba0fa955b16c1fda5
 EBUILD coq-8.15.2.ebuild 2396 BLAKE2B 5648c9ffb0d8986ef485feef651526473552d38101cfc9692cf05dac8d5721af92d5ffacb19e29ec741b2b2804c9f49b8b08b64e605a7b03b51abc51593bad23 SHA512 ec43c43e0d0569c47bb938a4468b4a248c5243ddfcfbc04bac8301ae37fdcef51e48799c8437b3301daebcd074743f7289f1ea54eae6cf44446eb164d6abda5a
diff --git a/sci-mathematics/coq/coq-8.11.2-r1.ebuild b/sci-mathematics/coq/coq-8.11.2-r1.ebuild
deleted file mode 100644
index d4baaa412f2b..000000000000
--- a/sci-mathematics/coq/coq-8.11.2-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Proof assistant written in O'Caml"
-HOMEPAGE="http://coq.inria.fr/"
-SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk debug +ocamlopt doc"
-
-RESTRICT=test
-
-RDEPEND="
-	dev-ml/camlp5:=[ocamlopt?]
-	|| (
-		dev-ml/num
-		<dev-lang/ocaml-4.09.0[ocamlopt?]
-	)
-	gtk? (
-		dev-ml/lablgtk:3=[sourceview,ocamlopt?]
-		dev-ml/lablgtk-sourceview:3=[ocamlopt?]
-	)"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	doc? (
-		media-libs/netpbm[png,postscript(+),zlib(+)]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathscience
-		dev-texlive/texlive-latexextra
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	ocaml_lib=$(ocamlc -where)
-	local myconf=(
-		-prefix /usr
-		-bindir /usr/bin
-		-libdir /usr/$(get_libdir)/coq
-		-mandir /usr/share/man
-		-coqdocdir /usr/$(get_libdir)/coq/coqdoc
-		-docdir /usr/share/doc/${PF}
-		-configdir /etc/xdg/${PN}
-		)
-
-	use debug && myconf+=( -debug )
-	use doc || myconf+=( -with-doc no )
-
-	if use gtk; then
-		if use ocamlopt; then
-			myconf+=( -coqide opt )
-		else
-			myconf+=( -coqide byte )
-		fi
-	else
-		myconf+=( -coqide no )
-	fi
-
-	use ocamlopt || myconf+=( -byte-only )
-
-	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	emake STRIP="true" -j1 world VERBOSE=1
-}
-
-src_test() {
-	emake STRIP="true" check VERBOSE=1
-}
-
-src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1
-	dodoc README.md CREDITS
-
-	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
-}
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index 287f23ea2036..8250757b06ef 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -7,7 +7,7 @@ AUX why3-for-spark-2021-flags.patch 1234 BLAKE2B 617040fbf9204382adda8161a07ab52
 DIST 8bb5801e17b8b23453262da69c981c091959eec7?filename=why3-2020-20200429-199EF-src.tar.gz 9739066 BLAKE2B c7c11a92d4926f90be9ffa94d74e65ad78423953b53ee617565ccfcea4a5a60b251367b0712c30d170ab717d5868f7d95d62694f38c3d2f52805a28a6522ab8a SHA512 61cd5509957230ff81186d2507b9749b182cdc44698f6658337ce294d210742e57164d25d7c0eb3eb5ea0c53f5f46dea099e6a0769fadcb709a5a8557ed3cae3
 DIST why3-2019-20190517-197BB-src.tar.gz 9439414 BLAKE2B 68072064e8ee9152528c90afc948047a1f4d58b960ac05b276761fdca5ba1204100c75f33db7bb0ea1a8a646b734e62892ed41bd875b954354f52b8f9d498d4a SHA512 9169a4ff9ee994a19f9f04b689d1b9c679f5340bcd631d7d49b4c55064f505bd5a6ca8149077e5d24d36f5365f0cab58587094e86f352a9105fc46f10c0746ba
 DIST why3-2021-20210519-19ADF-src.tar.gz 10386938 BLAKE2B 93b6323c562126244f5cccef34088a521fe3dc1cec07c966e94472503ec8492707b20a641936449307f0439e711a82260d36679cbc69f53df8e7886a1d3673c3 SHA512 65e3c1430001962f2c7cce786f3e30f14b5295cff89c4087d95c1545e81743723319ba0309dbe15c4c46552110b25ff57addc3ee085dade02ea59a2273b127db
-EBUILD why3-for-spark-2019-r2.ebuild 3011 BLAKE2B d823e518d18dedf262c091eb1356e22e6a412346a2839179a0972e2247802b0061ec928c77fb0c4427b4ac5b5cf90102ba713c9a69f967e5ef18708e6cc37fa6 SHA512 634ff8c00b5ffb94ac6cb084ba440657b096e42a2b37aacb8428a266f15e11efc20da6f7bf7c830d0af719dca03c01b9fbe846a69db8baa524060991fe9e9dae
-EBUILD why3-for-spark-2020.ebuild 2930 BLAKE2B 1d157e7cff70af0e02f07ef1e448abd4d7ea573921832910243d0931d92745a483705818b088dff0399509b0511a52f2502a041c06689ad4ad07d58735d08eda SHA512 c9fd1a6af36df3f6f9f3463ae73696a73b4fbf3f87f82138a970f4e7bde1d78177d19098f03527228d9f5d3a72d67f10fdac38fcc6e11053b08894c6d88923fb
+EBUILD why3-for-spark-2019-r2.ebuild 2961 BLAKE2B edd2d2be5ad1c4f008cc88cda35f14f0ce339fbc969f35dfb28c2afe0bc9d725fb4843d308d10bc1dc1061c093198a6e981210e6681bdded09dec802fa24e724 SHA512 8e0e5e7f482834418953cf4551316b1b21f8dfbe9898684de74c083288e17ae60c2cd1184f8f0411fdb3701b10e2cc470ab8ff03448693bb20ed9e05f24d2bf4
+EBUILD why3-for-spark-2020.ebuild 2849 BLAKE2B ab8c3b626ec8d0346597fc32ecbb2566671f03b66d6b0109a5d5299fdcd9c8eaad37ecd43e8a82fdaa28c2d18dab6166b6d1581d2598a632205dd90fdfb4b49b SHA512 9891f9e5d2555c01129a99d6b60d5d5812d696fd903698799a005cb94ec741a65296667c1d4d44b97d5c04c902f627be96e999762806fb30ef424ae13dca51ea
 EBUILD why3-for-spark-2021-r1.ebuild 2941 BLAKE2B 0b65e823a7698aad20db85c142b2c53df9e71faaac917b83f3d5ed017e5bce3cc6e07abbb10f9b90441920af77b6b1379f62e32bbd91555f8028a531b5f771d1 SHA512 20c1ea704a32cb13d76829cf71f5968dfa62f5f621bb74cc004069a5cf03998d20f7c04e3dea058db0dfd8fa13b95472b592ce3d95d5c59c6f7f0e6848bf471e
 MISC metadata.xml 1486 BLAKE2B 3f8757b80b9b1b031fdfee11a4d1fb8aa6bf52b496e7fe2f26b3159313aa6df3998717b9b7d69a3e8c1206425986d3f8faa4d73b7ca1e216b90521c6bbe10c68 SHA512 60dd1f95702d163ad46f636d4af302437cab29d29fb1466352ff2889841d378bb2c6d4670cd626dcf612f2a1196627f09282f29e63815a929411d5bbdc68593e
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild
index bc975bd21a6b..f83359f0ee7e 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2019-r2.ebuild
@@ -13,14 +13,13 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf915d31e87a8f1c967d54
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt zarith zip"
+IUSE="doc emacs gtk html hypothesis-selection +ocamlopt zarith zip"
 RESTRICT="strip"
 
 DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt=]
 	>=dev-ml/ocamlbuild-0.14.0
 	<=dev-ml/menhir-20190924:=
 	dev-ml/num:=
-	coq? ( >=sci-mathematics/coq-8.9.1 )
 	doc? ( dev-tex/rubber )
 	gtk? ( >=dev-ml/lablgtk-2.18.8:=[sourceview] )
 	emacs? ( >=app-editors/emacs-23.1:* )
@@ -73,7 +72,7 @@ src_configure() {
 		--disable-pvs-libs \
 		--disable-isabelle-libs \
 		--enable-verbose-make \
-		$(use_enable coq coq-libs) \
+		--disable-coq-libs \
 		$(use_enable doc) \
 		$(use_enable emacs emacs-compilation) \
 		$(use_enable gtk ide) \
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2020.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2020.ebuild
index 9075ebf3e9da..66a760496a92 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2020.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2020.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://community.download.adacore.com/v1/8bb5801e17b8b23453262da69c981
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="coq doc emacs gtk html +ocamlopt zarith zip"
+IUSE="doc emacs gtk html +ocamlopt zarith zip"
 RESTRICT="strip"
 
 DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt=]
@@ -22,10 +22,6 @@ DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt=]
 	dev-ml/menhir:=
 	<dev-ml/num-1.4:=
 	dev-ml/yojson:=
-	coq? (
-		>=sci-mathematics/coq-8.9.1
-		<sci-mathematics/coq-8.12
-	)
 	doc? (
 		dev-tex/rubber
 		dev-python/sphinx
@@ -80,7 +76,7 @@ src_configure() {
 		--disable-pvs-libs \
 		--disable-isabelle-libs \
 		--enable-verbose-make \
-		$(use_enable coq coq-libs) \
+		--disable-coq-libs \
 		$(use_enable doc) \
 		$(use_enable emacs emacs-compilation) \
 		$(use_enable gtk ide) \
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b4bd6a3499a6..06c6ce5c14f9 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bindfs/Manifest b/sys-fs/bindfs/Manifest
index 7fe81f2198df..38fe373c99a1 100644
--- a/sys-fs/bindfs/Manifest
+++ b/sys-fs/bindfs/Manifest
@@ -2,8 +2,10 @@ DIST bindfs-1.14.9.tar.gz 410344 BLAKE2B 3875c436e7f52a59c0b7aeb2d7fbcfa7d4edfc3
 DIST bindfs-1.15.0.tar.gz 415596 BLAKE2B e80bf7e233668ceddb6f57b7b939a68c918f3a6635d99bdc0efdacd67d74fdea66aa3d03ced6cfeddfc1a402e9866d27d83bcbe39dc6c25c50247c6b42739d9a SHA512 4f11dcb29321daa950bc8d778c7cc0269f200535367534c5ebb1e85f2f9e0e37359ebaa0d033fefc2140f07915d6ad7e884d185ac168db31c32e2e52175d0bfa
 DIST bindfs-1.15.1.tar.gz 415676 BLAKE2B 1d18d7a51e60e5ef304cdd13e908ebf5ca3e684b640f6c21678be685c3ff15ed43a20edcecfd6ef13d631974b11c5c7145e4365bf52f7e9280a53772f1377b84 SHA512 da9003f141b7aa2c23651b3b836b1d979bf1b19915f307c05e40ae6906aab738036cc8b5df6caeec158e4fa6b7bca71489ea7884ff1607c6fea72a603a048d59
 DIST bindfs-1.16.1.tar.gz 421240 BLAKE2B 1c33891d7f8f6beed2d18a50e2742c5cf8474f9b27b2afdac593f8a923445d7e2af9027371655845846d4fc67a858f1863a207cb8a78335a179329501a52454f SHA512 6fc6121dc5a9db040f444b432aed4c720250e268087c68e5a0c9a652370a431c94c05fddfa8515ffb86a0f76582bb9a8fa4f9ef66608b82a3b8a5fbb00d2f3dc
+DIST bindfs-1.17.1.tar.gz 422341 BLAKE2B 7a4d83c88d2507fdaa9f7e602b73020be8eebb516742936e569d61894bb053a55a7b13bae8aa8301c0f8df486df2ccb5ea14d8bee7fff62ccfd72c88a1a6358e SHA512 9e7627d6fbb1348136e0716d5729cbc4951cd087efeff884d7ddc86429e3cd6e01b4f0a5b469ffa112421be1213dccc4723ab28f8db4b2f7d19525de705ffc77
 EBUILD bindfs-1.14.9.ebuild 478 BLAKE2B 2be2fd62b6507cbaf1a5e57a0582f87278bb6f568f000ef805f159bc4e655104d2f18ac9b1f9d164155b7706d6779f13abdb63979fb3e9200be837dd8e715d12 SHA512 c006e5f23ffd417f5a8c77b417f20ca083ba2a4669189806217a73685a8b62ede8bab826bd6ae713af35dda4bce2eee800f5e12e4866d0f3b6cb1dc53e1434b3
 EBUILD bindfs-1.15.0.ebuild 494 BLAKE2B 1c12cfd2b776d5847e5d74517db43081e3bcd915c82e76dda412ff5d278c216543a9c7066470235b2b55ac12e4a6d1c70df8a3ffd2f0ce374dccab8f5f96f201 SHA512 e02feecc34a1b2f43f27f9124a35810609aa047c49642985dbedf693538dc9d778fdca5af9cb16c2fb8012323fea2899aa4df4e4931bc54f2880b2a97f2d04e6
 EBUILD bindfs-1.15.1.ebuild 494 BLAKE2B 1c12cfd2b776d5847e5d74517db43081e3bcd915c82e76dda412ff5d278c216543a9c7066470235b2b55ac12e4a6d1c70df8a3ffd2f0ce374dccab8f5f96f201 SHA512 e02feecc34a1b2f43f27f9124a35810609aa047c49642985dbedf693538dc9d778fdca5af9cb16c2fb8012323fea2899aa4df4e4931bc54f2880b2a97f2d04e6
 EBUILD bindfs-1.16.1.ebuild 494 BLAKE2B df54b3781a6b974360e373bf54771af91ce9c58b31466453788a8850026dd0e2829ee8f5e95c3c48b03c001aa59db43eabde056328916b8ab5d0fed4be3a7e9b SHA512 4ade233d80777d90a586004697567bb8598330ef734d32a4d01da9cc44d76ad416d0398b1d020bd716796755dcecec9ef8ecf3f4c826327aebc97a531c1c6696
+EBUILD bindfs-1.17.1.ebuild 494 BLAKE2B df54b3781a6b974360e373bf54771af91ce9c58b31466453788a8850026dd0e2829ee8f5e95c3c48b03c001aa59db43eabde056328916b8ab5d0fed4be3a7e9b SHA512 4ade233d80777d90a586004697567bb8598330ef734d32a4d01da9cc44d76ad416d0398b1d020bd716796755dcecec9ef8ecf3f4c826327aebc97a531c1c6696
 MISC metadata.xml 326 BLAKE2B 4618fbe2b0a0ec5941e217fe7e22752e275db8a7e8caa55ec8b6a4a7d69727e8a97d06670e3ffddd0a1497fcb8b1e788c2f4b0cb2456b7f7c1bccb4a7c055a33 SHA512 0c040a701da5588f06a94f487591e80000bfa351ba940ab42ea86ffbaa3f77548f4419f03bf104be3ac10fc457692c4100f39aae9142152d7f5f2303a840e591
diff --git a/sys-fs/bindfs/bindfs-1.17.1.ebuild b/sys-fs/bindfs/bindfs-1.17.1.ebuild
new file mode 100644
index 000000000000..f884f36abe85
--- /dev/null
+++ b/sys-fs/bindfs/bindfs-1.17.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
+HOMEPAGE="https://bindfs.org/"
+SRC_URI="https://bindfs.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=sys-fs/fuse-3.10.2:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+RESTRICT="test"
+
+src_configure() {
+	econf $(use_enable debug debug-output) --with-fuse3
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 87d58c5b779c..987aaa6e9371 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 2928ec1cbaf4..1f6ad6fa28cc 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,12 +8,16 @@ DIST genpatches-5.15-81.base.tar.xz 3257712 BLAKE2B 66e0d129053b2cf3ba59681318be
 DIST genpatches-5.15-81.extras.tar.xz 3932 BLAKE2B 0783c48eab8d9f53d07770a3df525df2ffdab8f36d3d7db2d22e2fc5b0d1fe904644b013a3d1a5ea3d967636d4ff91b3f208ea8f004adf310134b98ec5cdd0fd SHA512 be4b557066d8d2327724c8be440ebcedb01d0eadab7bfa0f9f230111cba76a2623bec0945fc887b91d6e5c73eec3eec4fa29b2e76606e7871e81a91fdc4b2bf9
 DIST genpatches-5.15-83.base.tar.xz 3328188 BLAKE2B 5d8da81e1c5f936ce49589d1dd10f41246a6059c410c0215b495ca7401eb618aa6c87d2ae23b08f27e3be5dd6b7f88e5d4e90ec9950924db9a08375d45cb2da3 SHA512 fdcbf6bc1e17f04df9d8334c1c75f21e5ca60fb99157708a4c599e43ed20a58664fe54fe8467924623d612ba2ddd409af4840195369fe274a4f55a84fce12ade
 DIST genpatches-5.15-83.extras.tar.xz 3932 BLAKE2B 42ba0ee79654687ad5c858344ef7a1787c23fdadcf312788b2f53e739bd6319b3771c89d93eef7f604bd4f9275777421fcac09f8030af81cff6b3d9482b8e804 SHA512 55873c4cac9a4c5bf030b562c927fcc663a9a092602366d170541050386d427fac2dd8ac013d13b700bd874e47655d10b2cedb5b4c1034f41819c675aea80506
+DIST genpatches-5.15-84.base.tar.xz 3361044 BLAKE2B 355479d56f6234f63cdf7acad501784edc72f3e55ff6ac0e09ac26004c38aa30fff62893036ab413d0e8f1334a41568c59e075452b5c3909f88b8f48f0104748 SHA512 7a7a3b03d5aa348c7e4c5d4d7e4972c8538778367a9eb1984c1f0b3ab202ad27b92d1fd7f29dbc3fbc17cd413d3c1a571f5201355b27c22bf0f55bf7f0d57206
+DIST genpatches-5.15-84.extras.tar.xz 3932 BLAKE2B 1729d46e8de60b40e69fdf7f63048d9c4142de4a4dfd75695f3303034b1b1732aee6c20a62a3f2d7b4b464e22babdd6261ae4249a79f79bcd7c817faef55ad5e SHA512 223124d0323024c383ca342969404fcc514596364a90cc98bf8a8e0105e5c2420973a2efb6a47c732775a4672fcba4d3d4386a8fa5350e8ce8a98dcb6f5718fe
 DIST genpatches-5.4-228.base.tar.xz 5198204 BLAKE2B 35942e1ffbfd792f2479ce2b97c7f191cf5fc5712ccf101ee1f5f7f0486d53da2307237fc2d50fe0353c82557df03fbdfbc669949616dfeda69970628ad98ee5 SHA512 333dd865d3f10083566ddf43ff4d159a6842c3ed92c703dbcebd0832b0fdbc53c0025856eb1608ac485c805702608e52c600e08922fb831536bc6a099f74f1d8
 DIST genpatches-5.4-228.extras.tar.xz 1812 BLAKE2B dc4f0815c8915ae371db4da0ecc1066a269547ba1a967a6067121de25c06445356b6f1339088d402e7f9ca5dbb91b49ab717dc3168760cb26ff3e279177e16e4 SHA512 7ab2f0466b677b3506c080bacae1217b54b35ccb45f65000757bfa09e3ca2834a3b78c4b03730f11c6948be3e3a04c1fe3bc562585248039185d94ba805adfe7
 DIST genpatches-5.4-229.base.tar.xz 5214840 BLAKE2B ede38de7b09b59ab96596aa4e47f7d2dff06e8e3e403e0b3a15092991bd21504ccffdc21b8fc5857fbd21ee89842f7a6d74fd88b5c7426ae2a5dd3d50ce8db51 SHA512 ad086f2b00e870d54b1605eac7fe537654c09830b69c316cee71a7bb5e621e6ada37ef780c4d2c3ea9678e4a72c19355acac2648e16943ba0dde4e711909826b
 DIST genpatches-5.4-229.extras.tar.xz 1812 BLAKE2B d5d084cd21e2a4f6235f0438e8d92746fcfbc9f86170247b00ade3d2aac99e06c4b10bbe725780e8f9644c7404e8defd360c3e9d360cac1e5c5a8a2ffb17adef SHA512 c21105638451b761588caaf266d901de7a5640d72540954c3c559b675dc265cca8ea5e56de1c3c644bda4c4e09fe174ece02ed6e506d12e718e035825dda3e0d
 DIST genpatches-5.4-230.base.tar.xz 5241272 BLAKE2B 59a4ad6f7b2f3380e5521a2d48e7da526bb8dc177d04c147e5699b75efd76e62e94b97a96d7d2f50c70fdd684c57f76f1a0017fafc223f7a31f7d26ef24a5365 SHA512 f69615ad62cef31b53cb89ce072760e17f9f22a40217ca1057e34939ed2fbaadafea2811e68fbbb91f62aeb630d4ca71ed63442efa5448c1e44554a4cbb57b12
 DIST genpatches-5.4-230.extras.tar.xz 1812 BLAKE2B 62c614ec2f856867ab6e6953fcbe533fba508263a2f0e0f9e422ba9c4f159af9564d8ad57368f4e8a9e645302b3cdc8ef1ac5a626cb8e18380c025f3290ba56a SHA512 911595072c899538d66313d24585df62a9dd4e44e46980b14e1b6d0c61a64d55b6a66e4b30cae49965900bbbe634c2ebb36aac1d084038829da2a1a59b721186
+DIST genpatches-6.0-10.base.tar.xz 546380 BLAKE2B faad43e3066e880e9074c57499eef61f85a8279cb37b7c999f41194588c766bfcb529cd6bd43b234e865c837ca970706935d6fea32fbcb46c49e9a67d274f262 SHA512 c4e37e027f8c9c7ce833d4b5c887b261bbe617222d4b1203bf0ccbb35b384bb185bfa5e3bccc187e7658baaa50a015a5ce2a41a6d9c8fa5ad883a46692b00d8c
+DIST genpatches-6.0-10.extras.tar.xz 3804 BLAKE2B 392620ebf627c7f480b0031b9e3e712ec0005b7e83596ef192908cde5740df06cec0605b09a15ba9420919b37a61136611a9e3e13f82caa63d0337f3d9b167e0 SHA512 86511fa64c02b703426450ade1811ce5b3614a6a232cba35f016837572e34a7ea0c751eb90ffe971f6a3321e0f9f61f8f032bd1cab5b0d55f8112acff42b4f61
 DIST genpatches-6.0-9.base.tar.xz 478548 BLAKE2B 916f2b1b5d198adec6f73a0bb52029f4667132e7b7528ac5578134e3ed775d6aaac7989ec5e3827fe16db691f3321ef16b5a29088d2ad81e963f768f67cc2b61 SHA512 6b748f241e609d6191f83134f65bd9010122d5681b080c7ffeff8690f4cb1ab0f44b2681a135689d945de45f4ef25384411aea1d78a5b1c6248e547dc9e5297e
 DIST genpatches-6.0-9.extras.tar.xz 3808 BLAKE2B cf37233fbfc631e8ec9d7c663e8982a3bfb154573fa84d13cbb3d67fa73ff38ce74b27bf6dbf827b311826d18c628ef2818a75975e068ce381bc1a46c4948075 SHA512 b4f5d0daae3120662fb79e9f53b7dfd0c15f0a2b7c77a32b7440cc7425b3df87107aabb2cd913a31b7014c9fd1c3c85ab2081839af652ae9d7e43352dcdda42f
 DIST gentoo-kernel-5.10.153-1.amd64.gpkg.tar 66529280 BLAKE2B f0e4ccfc14b29dcd25ccea3ebd199a6a61092a42d4df68f36e699cf4059674bb0f3056c348fe8da0322bdb9dbc8806e36e87dc329fd88baa0f39c442324ffe71 SHA512 a53fe9f935e05311f40dcffab224791b64b42f218c78e2737d4a4a396df08d0d21f85858d3767a0df329a038c93e892ceadb3db58646d6f103e6941e0b4aa772
@@ -36,6 +40,10 @@ DIST gentoo-kernel-5.15.79-1.amd64.gpkg.tar 69816320 BLAKE2B 6498a6008805dda5b3b
 DIST gentoo-kernel-5.15.79-1.arm64.gpkg.tar 62883840 BLAKE2B efdd14f1514d2b5900d6c89a84302d86d6b55e025850ded55a1fbf984c0a206e3c587ec3659f8b7344709efb1ad7f394f5017c9c8cc121bd61f1de6fd424b311 SHA512 d34dea185efcac93c2ee13829f284fbbe85c5ddc96435f9e729135af53b052b75c56d8c61d8d2a1f2e84711e414d3d3bab8ec618a47a0263969fa8395ffbfa08
 DIST gentoo-kernel-5.15.79-1.ppc64le.gpkg.tar 57241600 BLAKE2B 8d7b6af97f6c74264b08a00eec3acd6db1df92b19f4f18e181639e2b354d0626ec8e32f51e17966159f039d72dfba10d4bb535e1f966481d54c796f91921bcb8 SHA512 2e03c61a7eef436e2a75bf852beb02251f0f7c7ca24d4ec693430a8adcd812bfb3e0acf6cfd6a487b1b39c5ac4eaf4072a53d603e9a3a60a5c63ca7becc2db9a
 DIST gentoo-kernel-5.15.79-1.x86.gpkg.tar 59146240 BLAKE2B 6e39b2a1a9f16f9488efa89989a7f1e65fcb37001b799d625d4fd050702eb036d397b5c0e5f283f38b453906a6584cd073c9364cd6edacb12774b940d3db763d SHA512 11ef510e14fb2ae39e8e6f1c4b24f44bf3294b6efda2781a5b1665e23ab7e0f57d6cf5b4e04ea34d050736a377cb37d5b069834c1cd6e47ecc97d43fd32bf611
+DIST gentoo-kernel-5.15.80-1.amd64.gpkg.tar 69795840 BLAKE2B 88aac1859dc18a35c93978cdfb8549083bade9251f8b86248ce88684512683490986431d46c6298282313adfe76754922510f037c0b3eddb989fa08c42ebfd3e SHA512 c661ac40bd9d8b70c1ac290be33398de0ebe70e3b22cafb6f26d0aaf977d5f81e66a23d4a70f1a5fa034f4c6e91874069a5f2b12ab4d38de77253495ef311f45
+DIST gentoo-kernel-5.15.80-1.arm64.gpkg.tar 62873600 BLAKE2B 4eff285c6caef0120a604bc83e1bb4e9faca4217b84ddafde768587cf17c642a86761bc803a528ed7a6edec7fc7d5d5c44f1c766233aa0597461aefdf114f894 SHA512 7cf1fdbe6de6a31165ed608b9041b00824935b09e72e36a3eab0be8763d1430c23842f23a99d764387c268f9a485635d346275f746ea8eba685e6f8abbb6b610
+DIST gentoo-kernel-5.15.80-1.ppc64le.gpkg.tar 57241600 BLAKE2B 7580860335c37f55ac3c676e784b84b02296324d07910d66a5a8974c2c4410e22f49c03c5ac1f20e7dc81b37922ab052cf3c918606197e51a38ab6e3cea88063 SHA512 aa9f22f64f2f652113d4d4f4ff56934c02ff32053293a05d9075052cf8151913101de38384037cffeacbc5b2f8863add45d18d1646b6bf57b49f46ca7eb23572
+DIST gentoo-kernel-5.15.80-1.x86.gpkg.tar 59136000 BLAKE2B 4a0733a6d3754b7fb1b158d8238673b0e380dff52366346a03de5608bdeb7edc2987560429382beb867869adf1f5c6d7bd1594ae4e1f60fb34fc05ec42f923dc SHA512 44b79d83902ba38cc62d972670c16f3cf22ee3a1bf09afb37aa9e174a8662925dbd62aaf9090eee0323e24106fa9aa6ba630fa22cfd7df08e2988c9d9b3fd7a6
 DIST gentoo-kernel-5.4.223-1.amd64.gpkg.tar 60620800 BLAKE2B 1fbd9fdc06da23b51f136db8eb5d2db76110116c5f73868b07162d853c5ef95094f953bc02686f2855b9b5b0954792c4eac884f6f81c1dc524d8c14e4310849b SHA512 9ed74651baff980bc578eec8cc66486d5183a042943e77d6f11e37ae26f7b8892128b1886038ec4b683762a61bf1a35ba2cd571037118557f4dd4f4494b2c720
 DIST gentoo-kernel-5.4.223-1.arm64.gpkg.tar 56821760 BLAKE2B fc2ce930c0bd6d3c3efd51057e40bd1c83db3a812c8aac5996d05978aae4dbe6163012699c72fec553d83e1397e6cd9601fefbfe3105c30523ba49f1daac4a52 SHA512 d4fa5d7570c6fc7534d92ff23fedb2349196d0b07b7a8ed8fef43b40cd6a63205ffb30378340f704652b4e3a16b45aec3ab6bca9ae308548197c5c9383a1f452
 DIST gentoo-kernel-5.4.223-1.ppc64le.gpkg.tar 54343680 BLAKE2B dc69045d3281260f370a97e2f77315f8488fc730980e7b3a93cd85ef3fd3044e18a0f8a1bd81d48e33acab8eb41b07fedc3679e4b1a732146d13b3552febb753 SHA512 b0463414a8a1503d393d8446c399269167d871591da08258a258f280cddb81bf8a6f20f4e3a9699cb64f2d7118bd0347b77cdb52f7340486a41b8bcbee1f6ba3
@@ -48,6 +56,10 @@ DIST gentoo-kernel-5.4.225-1.amd64.gpkg.tar 60590080 BLAKE2B dc8493b1e23b4900e60
 DIST gentoo-kernel-5.4.225-1.arm64.gpkg.tar 56821760 BLAKE2B 8f799e1766197bbfa02efee0d256cfa44a3cb7c4de38ba6fd119e93544cd4f38201dadd0771dc8fdda1e4786d7b43f5fd589b17ed99d21945c96704019f818de SHA512 3960e9f5cf644a305fa978ae28df192f4a391edc52f58097a1c7705f5d3281d9a0c17d3083010768e9b3f080ad7ed54fd5520d2c4492d4cb695ae9cd6915fd48
 DIST gentoo-kernel-5.4.225-1.ppc64le.gpkg.tar 54353920 BLAKE2B 344ce9ae954e82b81766a70ffaba056c26013270c802e1c06d582859888726722b0aa6a1005fabc05926e77bb1aba0c452c45a35b1cbadd0b1455dbe3ec478df SHA512 6be76c28b9e9a819d3b3e7e3ad79122b301aa187159a25807bd1a0c656174cc121e6bb8b64c1f880e53c7e514e52004a710d2796aa63a2b79beede0dcec8e374
 DIST gentoo-kernel-5.4.225-1.x86.gpkg.tar 52387840 BLAKE2B ba357a39442743f0f65bf360ccb1b4c5302e6507a7fff7d714d71a0c458da070b65f72dae1012d3a6dc7099e4b4250f7b33cd1801cdef3cd7e9738164b713b70 SHA512 b7946fa7ba73af920842b2d1190744a4d30ece5b7015fa7ff99f2f011dc5c54e06839cc7808d59d6be89d0acda7dc22d11cdc6172ade29c04c0ee6a3a6289c65
+DIST gentoo-kernel-6.0.10-1.amd64.gpkg.tar 75939840 BLAKE2B c97960c5c989babe1e7014c62f75ccd8facab8bf4fba085706ef4fc363d5c886e2682299c502a2800667d4c8a2547233e1fc0a8fd3daebe0a6ccc022f1b573cc SHA512 5996324a9c9e27a01dbef3a481eab7a7eab102912abafbaa4939b6e780dc83784238bdc387fe58ee8d41222bfd5038c3d5684bb6272b5870f14467b79a64c428
+DIST gentoo-kernel-6.0.10-1.arm64.gpkg.tar 68833280 BLAKE2B 59dc4659c3bd764768c6cd00e8bfc0db79ed61207d6dac58898b1074adba764e88f6dfec6f910f04e7615724acfc57826691cdc4453dbab1cc1a049785abfea6 SHA512 e1b27ff83e9c937072e829f7cc0753e423d4aa75776f92118d28a1f8d056c4d27c61d562ef36aeeb67aebd8112c8acb2eda7170b66e476e8c4fb62f5b6b4100a
+DIST gentoo-kernel-6.0.10-1.ppc64le.gpkg.tar 62146560 BLAKE2B 906a047c07a7091b3375c3a70ed84f87b2507337bac3266c86b133e3f4b4dd256449f926d5a54b76bc050ddd3dbf553e6777c8e3ef54a655a31376a00193cfee SHA512 961fc68e368d4a348b103876c6255c7ec25497a06600077b84176e25d99a782e335201a7b74a3cfd80f27c9da82c4ab323d55a7d9f1279fbcc4fbabb8f1f3f61
+DIST gentoo-kernel-6.0.10-1.x86.gpkg.tar 65320960 BLAKE2B 772bdc37ae495658111c5f998c9874eb9947e2a37ee8e0c88d75c9f3e1d981c1e57f841b444287ee334d9f5930f76e2503f9a3ea6154b3bf0a63e9d601b4e079 SHA512 545efb78abe864f1248b4a85f8bb305ced09c343aa0219bfc262789dcd249abb61c956ea9178297b1cc4a188e2fc14b318c7f2c8e39d54daa5fe954b8f266b49
 DIST gentoo-kernel-6.0.9-1.amd64.gpkg.tar 75929600 BLAKE2B c8798004001baece32bf8a6e242423b04b7e4cea4876fb42baae7e2299adde61591dfa62d06ec385db8ac1b985e8353dccb797b08ef0c42ea21c054c451f27f1 SHA512 4730dff292802f82fe9b6d1c73ab0eb42d00b2d9c7d672ec347c59a0dfa1a586f773a2bf1b6eb7d4e905da1ef678269715f55ef275cd44556520f163002e8cde
 DIST gentoo-kernel-6.0.9-1.arm64.gpkg.tar 68843520 BLAKE2B 6eec02147edfe83ec7a6a62a5d02d6982649c28654f160223ae6e8479b6071174a26e256ca8504e9a8ecb0f6b26036b2972d9be71f6d23bd6c5c627bf203707b SHA512 83cc9b1022bc652cb5a8105c58f3dcda1c21216ffede67835eab9bbec58cf4c2188655337f03692fa1c1b2a4d24ffcd99c49cdef7300a9fa6f1a4f9b4d642628
 DIST gentoo-kernel-6.0.9-1.ppc64le.gpkg.tar 62146560 BLAKE2B aff5949a4e9e26f2a63599953e949c8747bef2fa7ddf05e25b8bb095dd1635d3ffb03d37608b6e84e111616d1438425da0a39f91c0621fab8bc1c0cbe5b926dc SHA512 555ca3733ad5883b04100cfa934da2b979e22f2345a3b5b88b86efbf0b9c111d52062b0a706c00b58a4f891c9a6e3e57350f2efca09b249bb71a4af8e16749f3
@@ -61,8 +73,10 @@ EBUILD gentoo-kernel-bin-5.10.155.ebuild 3001 BLAKE2B 8976627605b6add3e840ff24e2
 EBUILD gentoo-kernel-bin-5.10.156.ebuild 3003 BLAKE2B 1ef35e23fee13cc5319e61805de11434e3b2fb31c444d3924834ccc46e1bfabb553ecb8157355c344b71f66eb5013dd0e9f93aadc0ded81bbfa52e49faf574b6 SHA512 3b9af766614931f4c0c2d5ea26365a7f9aaaeeddaddb4aee6a4935fbe96c3c626ddec9ff25c5ac3f21342eb2bec896c6ae9ddf6d52baabd5081cd00dd0f74616
 EBUILD gentoo-kernel-bin-5.15.77.ebuild 2999 BLAKE2B bf50105e6cc148a793b36139a419ac66f4f14b4a73394b21af62803ab61347d87f800f066ccf7c9e33951c2efbb6d6dd77e7b7f296293cee6b0b7f17f3d1e7e2 SHA512 85bce161a2af46e8b9a2a005200e29e30e1bffc8c2263b7db2a756a73d411168dfc0e7720df907e58ccafe059f72558a47d8c93d9240222c093990de08d7500b
 EBUILD gentoo-kernel-bin-5.15.79.ebuild 3001 BLAKE2B 3e2b4c31bac5dfb2ac7b6e3a62a22580e6455c0d461e6a823b5fa444e027cc3edb79206045d7dfc39ce744ada2a54240912e97bebc7edb3e0fd72d797bf22972 SHA512 2155aa1cd7fc937018fbc959a3ee2fd16ae1852ed11ddeb1d0e6404d3a15100e67f088d257ab13d0fb5f142ec03a472db0b24fabc3248a90fdaf9ace51b2a7d8
+EBUILD gentoo-kernel-bin-5.15.80.ebuild 3003 BLAKE2B fe1fbf1260aaff760932d83c23aebec1313e9198d8332dece2d5f060bcdea5db46fbbabd1e0f5f125439247b64adaff285cebf06a566a9b4094f43e72089d690 SHA512 b90451d89a4c700892b682862015ac63e5153e30711a2f8acabb2157d84ab8705995460d8a58beba26873830ec85cab81bc734a94c68aa79173e35daf5b0ac23
 EBUILD gentoo-kernel-bin-5.4.223.ebuild 2999 BLAKE2B be5c5e139ee4da605dd15cf02c6251a762426d0da46ac2b75d46b79226e7c41c57429ed847e2e646735545fee33cb7ac45d62039158c0004380197255477be12 SHA512 b0ee61606614ca61b655b50a578efefd7fb49437014df935c4ea312ab1257dc415425684a05c6dac1e5dbeac5b1eac81071bf7cae4fec7bd68f8cae985b1c969
 EBUILD gentoo-kernel-bin-5.4.224.ebuild 3003 BLAKE2B 1f0a5c41743dd23f46541394f5afa07a6cbb1c212f0fd8ef0a04ee69133fedd983513683c8668cf04e100d91907f994df1e2b132dfb13e6f9d610f52ab5afd8c SHA512 8e0a773951040347aa49a20ae9f8b3df4b6cf3cddbb01e31ce7dc256f6ebcddeae63413b9114f568ea96cac023d2f5af627b0a0360fa1037cdb011df52ae2233
 EBUILD gentoo-kernel-bin-5.4.225.ebuild 3003 BLAKE2B 1f0a5c41743dd23f46541394f5afa07a6cbb1c212f0fd8ef0a04ee69133fedd983513683c8668cf04e100d91907f994df1e2b132dfb13e6f9d610f52ab5afd8c SHA512 8e0a773951040347aa49a20ae9f8b3df4b6cf3cddbb01e31ce7dc256f6ebcddeae63413b9114f568ea96cac023d2f5af627b0a0360fa1037cdb011df52ae2233
+EBUILD gentoo-kernel-bin-6.0.10.ebuild 3003 BLAKE2B 8378e8fc136de7923ecd44e58e0e1b694ac72ce5090e4ee86e4c086ecd923f58898e925f4ef3c5ed40918dc10cea348d53614d10e7e10aa58764d0d4df2e50f2 SHA512 80c0f1d10d1a85c2677d683178936e8c1bae08801d841cd7e2c79120f7517b464550c2c634de031428041c59ee3d8a5c96e28dcca386bb28303231288cb97a1a
 EBUILD gentoo-kernel-bin-6.0.9.ebuild 3001 BLAKE2B 3b5aa02aa443eef9a46de3e941cf7de000bd1b3c34e25bf9e4fdb5b323610ae18d80375c0af03b60f968f99d631c731a63dc892700a8766ab10faf68c668eba4 SHA512 a9e447068cf28255d13666c1d75e59408ff503f924c5580dc8fb538265eb059609427e40a99119d7d1b162a420f1051adf8ea53609bfa5a81f38ec5cbb79e852
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.80.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.80.ebuild
new file mode 100644
index 000000000000..9c843f83530a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.80.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.10.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.10.ebuild
new file mode 100644
index 000000000000..2b0e14e98e55
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.10.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 0 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index e830ee44fbce..53c928b45de4 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -8,12 +8,16 @@ DIST genpatches-5.15-81.base.tar.xz 3257712 BLAKE2B 66e0d129053b2cf3ba59681318be
 DIST genpatches-5.15-81.extras.tar.xz 3932 BLAKE2B 0783c48eab8d9f53d07770a3df525df2ffdab8f36d3d7db2d22e2fc5b0d1fe904644b013a3d1a5ea3d967636d4ff91b3f208ea8f004adf310134b98ec5cdd0fd SHA512 be4b557066d8d2327724c8be440ebcedb01d0eadab7bfa0f9f230111cba76a2623bec0945fc887b91d6e5c73eec3eec4fa29b2e76606e7871e81a91fdc4b2bf9
 DIST genpatches-5.15-83.base.tar.xz 3328188 BLAKE2B 5d8da81e1c5f936ce49589d1dd10f41246a6059c410c0215b495ca7401eb618aa6c87d2ae23b08f27e3be5dd6b7f88e5d4e90ec9950924db9a08375d45cb2da3 SHA512 fdcbf6bc1e17f04df9d8334c1c75f21e5ca60fb99157708a4c599e43ed20a58664fe54fe8467924623d612ba2ddd409af4840195369fe274a4f55a84fce12ade
 DIST genpatches-5.15-83.extras.tar.xz 3932 BLAKE2B 42ba0ee79654687ad5c858344ef7a1787c23fdadcf312788b2f53e739bd6319b3771c89d93eef7f604bd4f9275777421fcac09f8030af81cff6b3d9482b8e804 SHA512 55873c4cac9a4c5bf030b562c927fcc663a9a092602366d170541050386d427fac2dd8ac013d13b700bd874e47655d10b2cedb5b4c1034f41819c675aea80506
+DIST genpatches-5.15-84.base.tar.xz 3361044 BLAKE2B 355479d56f6234f63cdf7acad501784edc72f3e55ff6ac0e09ac26004c38aa30fff62893036ab413d0e8f1334a41568c59e075452b5c3909f88b8f48f0104748 SHA512 7a7a3b03d5aa348c7e4c5d4d7e4972c8538778367a9eb1984c1f0b3ab202ad27b92d1fd7f29dbc3fbc17cd413d3c1a571f5201355b27c22bf0f55bf7f0d57206
+DIST genpatches-5.15-84.extras.tar.xz 3932 BLAKE2B 1729d46e8de60b40e69fdf7f63048d9c4142de4a4dfd75695f3303034b1b1732aee6c20a62a3f2d7b4b464e22babdd6261ae4249a79f79bcd7c817faef55ad5e SHA512 223124d0323024c383ca342969404fcc514596364a90cc98bf8a8e0105e5c2420973a2efb6a47c732775a4672fcba4d3d4386a8fa5350e8ce8a98dcb6f5718fe
 DIST genpatches-5.4-228.base.tar.xz 5198204 BLAKE2B 35942e1ffbfd792f2479ce2b97c7f191cf5fc5712ccf101ee1f5f7f0486d53da2307237fc2d50fe0353c82557df03fbdfbc669949616dfeda69970628ad98ee5 SHA512 333dd865d3f10083566ddf43ff4d159a6842c3ed92c703dbcebd0832b0fdbc53c0025856eb1608ac485c805702608e52c600e08922fb831536bc6a099f74f1d8
 DIST genpatches-5.4-228.extras.tar.xz 1812 BLAKE2B dc4f0815c8915ae371db4da0ecc1066a269547ba1a967a6067121de25c06445356b6f1339088d402e7f9ca5dbb91b49ab717dc3168760cb26ff3e279177e16e4 SHA512 7ab2f0466b677b3506c080bacae1217b54b35ccb45f65000757bfa09e3ca2834a3b78c4b03730f11c6948be3e3a04c1fe3bc562585248039185d94ba805adfe7
 DIST genpatches-5.4-229.base.tar.xz 5214840 BLAKE2B ede38de7b09b59ab96596aa4e47f7d2dff06e8e3e403e0b3a15092991bd21504ccffdc21b8fc5857fbd21ee89842f7a6d74fd88b5c7426ae2a5dd3d50ce8db51 SHA512 ad086f2b00e870d54b1605eac7fe537654c09830b69c316cee71a7bb5e621e6ada37ef780c4d2c3ea9678e4a72c19355acac2648e16943ba0dde4e711909826b
 DIST genpatches-5.4-229.extras.tar.xz 1812 BLAKE2B d5d084cd21e2a4f6235f0438e8d92746fcfbc9f86170247b00ade3d2aac99e06c4b10bbe725780e8f9644c7404e8defd360c3e9d360cac1e5c5a8a2ffb17adef SHA512 c21105638451b761588caaf266d901de7a5640d72540954c3c559b675dc265cca8ea5e56de1c3c644bda4c4e09fe174ece02ed6e506d12e718e035825dda3e0d
 DIST genpatches-5.4-230.base.tar.xz 5241272 BLAKE2B 59a4ad6f7b2f3380e5521a2d48e7da526bb8dc177d04c147e5699b75efd76e62e94b97a96d7d2f50c70fdd684c57f76f1a0017fafc223f7a31f7d26ef24a5365 SHA512 f69615ad62cef31b53cb89ce072760e17f9f22a40217ca1057e34939ed2fbaadafea2811e68fbbb91f62aeb630d4ca71ed63442efa5448c1e44554a4cbb57b12
 DIST genpatches-5.4-230.extras.tar.xz 1812 BLAKE2B 62c614ec2f856867ab6e6953fcbe533fba508263a2f0e0f9e422ba9c4f159af9564d8ad57368f4e8a9e645302b3cdc8ef1ac5a626cb8e18380c025f3290ba56a SHA512 911595072c899538d66313d24585df62a9dd4e44e46980b14e1b6d0c61a64d55b6a66e4b30cae49965900bbbe634c2ebb36aac1d084038829da2a1a59b721186
+DIST genpatches-6.0-10.base.tar.xz 546380 BLAKE2B faad43e3066e880e9074c57499eef61f85a8279cb37b7c999f41194588c766bfcb529cd6bd43b234e865c837ca970706935d6fea32fbcb46c49e9a67d274f262 SHA512 c4e37e027f8c9c7ce833d4b5c887b261bbe617222d4b1203bf0ccbb35b384bb185bfa5e3bccc187e7658baaa50a015a5ce2a41a6d9c8fa5ad883a46692b00d8c
+DIST genpatches-6.0-10.extras.tar.xz 3804 BLAKE2B 392620ebf627c7f480b0031b9e3e712ec0005b7e83596ef192908cde5740df06cec0605b09a15ba9420919b37a61136611a9e3e13f82caa63d0337f3d9b167e0 SHA512 86511fa64c02b703426450ade1811ce5b3614a6a232cba35f016837572e34a7ea0c751eb90ffe971f6a3321e0f9f61f8f032bd1cab5b0d55f8112acff42b4f61
 DIST genpatches-6.0-9.base.tar.xz 478548 BLAKE2B 916f2b1b5d198adec6f73a0bb52029f4667132e7b7528ac5578134e3ed775d6aaac7989ec5e3827fe16db691f3321ef16b5a29088d2ad81e963f768f67cc2b61 SHA512 6b748f241e609d6191f83134f65bd9010122d5681b080c7ffeff8690f4cb1ab0f44b2681a135689d945de45f4ef25384411aea1d78a5b1c6248e547dc9e5297e
 DIST genpatches-6.0-9.extras.tar.xz 3808 BLAKE2B cf37233fbfc631e8ec9d7c663e8982a3bfb154573fa84d13cbb3d67fa73ff38ce74b27bf6dbf827b311826d18c628ef2818a75975e068ce381bc1a46c4948075 SHA512 b4f5d0daae3120662fb79e9f53b7dfd0c15f0a2b7c77a32b7440cc7425b3df87107aabb2cd913a31b7014c9fd1c3c85ab2081839af652ae9d7e43352dcdda42f
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
@@ -43,8 +47,10 @@ EBUILD gentoo-kernel-5.10.155.ebuild 3600 BLAKE2B 61673f8be761883f8b317eacc5e8b3
 EBUILD gentoo-kernel-5.10.156.ebuild 3602 BLAKE2B e4207d9a6e95adae3fe6502d582025a0a82d7e29c77e2d1d1bd89435d98640502c341a01666b61f2013b6373d26dda91396ec9d3d68c14e1214112d74d72f54b SHA512 66d938e669fbda1ff8a0f54d158174fec65692a5039f7cfe6f1f0d89cc2c3d4342b789376bc272dcd628ae285ea8d28c021d16ba674fdc5f887d8387a3bb10b8
 EBUILD gentoo-kernel-5.15.77.ebuild 3595 BLAKE2B 3f9177ab76f55b26f0b9785ca179df92d66c3faf2a875ea90c996834670cb22a0b0076549390f48058b71d5b3e352e2ab7c01003b1224f3b1380c5cb20ab6b47 SHA512 d2b6b3aecc1b3571043b19deeb89ae32c07cc62e81bb9385628de7fe7506d277cadcdab5d75a6af07c9f62a0bb88e9c80ec6e467b3ded7a9468ad858ffa4cd8f
 EBUILD gentoo-kernel-5.15.79.ebuild 3597 BLAKE2B a5d52517df75a431de25136b38348117eb80b22214d649479a8a34aaea32e4b8259a6f9724d259f9057626884554e2e868e9bbea6895ed17c8a14484dcd93f02 SHA512 b7cd8139884f7bb2be1489434e50858801653bccdf7aa6a853d89508932459f245f86e9058969220a9523dffa6edfe3d4c662bc59d34aa3ca917da927c1eeca3
+EBUILD gentoo-kernel-5.15.80.ebuild 3599 BLAKE2B ce2f332e14d6420a0ce635a8f1ea29788e46f385b7aef0fd7f86b2358c66574ea9e713927df98ae3e95b37ef0cf321cc4325bd1e8ad3a0da128d8942097286c9 SHA512 bc805c80743ad1ce74a09910c234e3ceddd6ff333eafc0babc7ff9ac7ba44ddc09d2c9e108a74b3223e6677eb77f91fe832b58f25e82a204a4adf8cc85517dec
 EBUILD gentoo-kernel-5.4.223.ebuild 2799 BLAKE2B 925a58a4afcb3c66f5179e8e5c23912332e7a1025ecd9d77b7d53cb89b25482c3dbf136b0340ecbbc4bd1430599302e5537d7a9e9e0314b5bbec1f9b98e76166 SHA512 4d67a306017b4741452ebbe3d0be3f29cffb0debc69bc2a605c6298d730c19a908ce8aca41a30888d9015f1330b9b6a4f5ba518714df41daf17900e8f29ddd44
 EBUILD gentoo-kernel-5.4.224.ebuild 2803 BLAKE2B b7562ff0061430bc6bc4978000cf3910f77d677262c29b1049d7cc9945f97319fcdc590a718ada8b6d51e7f84e2ba4956b37e770b4a6f933845889f32fe70d8e SHA512 3c00eea38ddeb1a18b6e1a57e0b6043835817e64635fec81928590f7833102265ba4db2c5783e218a284cbfdc7061a9e43da2ebc7fb34e3c5c0378a18ce41d81
 EBUILD gentoo-kernel-5.4.225.ebuild 2803 BLAKE2B b7562ff0061430bc6bc4978000cf3910f77d677262c29b1049d7cc9945f97319fcdc590a718ada8b6d51e7f84e2ba4956b37e770b4a6f933845889f32fe70d8e SHA512 3c00eea38ddeb1a18b6e1a57e0b6043835817e64635fec81928590f7833102265ba4db2c5783e218a284cbfdc7061a9e43da2ebc7fb34e3c5c0378a18ce41d81
+EBUILD gentoo-kernel-6.0.10.ebuild 3858 BLAKE2B 6431c930908b4ee1ac63c6a792a9f227122ca5822d4cfa76825c6b2b0ce2e22daabf3e29d885ab5cc0cd8cd56f49df82fe20fcb0bd38ca274ddcedadf5420db5 SHA512 edda364adf40995b1ba2ac3b158aba4216e859ec1d09ed0d593092d3d4986f06ee3bd3f13356a0397ce0bef555b494e6202bed857f3be03d65039e330f3e6277
 EBUILD gentoo-kernel-6.0.9.ebuild 3856 BLAKE2B 48a2e0b820e22cf8e12dd4b4b7ebb454c414f5077c6f9d5df417dacd915309ebb88becb225abd84fd2141e8b72435ad8411b1bb4766a97727073345abf94e860 SHA512 05e23e285445816dd8e23d5879f6a51e5640af55fac1d38129ac6dcad290b96b179fadc8e87a170d8c2a54969ec3ce05544607048a579604aa0d74b4589f93da
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80.ebuild
new file mode 100644
index 000000000000..4ea02f952baa
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.10.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.10.ebuild
new file mode 100644
index 000000000000..8dad214e738b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.10.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 0 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.0.8-gentoo
+GENTOO_CONFIG_VER=g3
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 254e9a5e75cc..a6975fb823ed 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -30,12 +30,16 @@ DIST linux-5.15.77.tar.sign 991 BLAKE2B 9f4d4e7d3f21a02f95771d7931212f026ed2543c
 DIST linux-5.15.77.tar.xz 126468704 BLAKE2B dcb7d95f577be18735f14c1a75148579af40bc35e57228eb7d35453cc8ddf9b6f9f71a7a15608be22049557ba307eabf5df42504f95cd6f414711733ff6b0738 SHA512 3b557ad399606deb2e00077da7c57af534ff5bd395297db534a9c643ff6e95b29b315d15bcb453255875785264347949a7e52ef3a676b7dd12db10764a6a5646
 DIST linux-5.15.79.tar.sign 991 BLAKE2B 49494481a44ee6917f39b985a08f544e3295ece6c1b143cf27248b10975e4c2610d5f7102c9df1606478ae18689429d6971ceccb78e8a06f1d76746628cfe243 SHA512 6bf59132c8d773d663209266393b5d327fb60ab7dc6f150aba1ba32cd1c4a47304a28a548114999d208cd24fb14418181317eb6dc7c37c840a489aa934ed5c7f
 DIST linux-5.15.79.tar.xz 126467592 BLAKE2B cd87a3892bbabdbbb2eb0731125c8e48fd3602f10411452b9c8834b38977a9868db79e766cbc542d03c63cb239062c78d413db5815fe60039fd92e67178afdc5 SHA512 5583f5fda70b2abe42212b254fe069f645845a0d664a806435acb898f87470ed25f6591810a406840a5a85479061aea6ed991cdfed29ca540b567d025e5d1326
+DIST linux-5.15.80.tar.sign 991 BLAKE2B 755c03e2ac0a88fcb973fc66e6d697056817d26cb9dd1167637c8b0a4599a954eb1a9fdb933d78249209370109bbe9c963b4417e2beb1fc74f47677c6474c41d SHA512 ac44a4eca608b274cdef9e0781c2d2fce6687ec556defb2d1ebe4da03190f04b3662ab29c9f341e62c4af429fce2b544f8597891f8649de120136e89c7b35453
+DIST linux-5.15.80.tar.xz 126478832 BLAKE2B 750121c79c4c7a64735cfe9417eb15689d1e9796810c4ae1f56f2bba9ee5cf4c5c920fa8d8962b24c7ca016ca6e23749a5da86310e52e6710744f61f2704cf0f SHA512 6434e6010678dd3c15b201ad9dd12a2a6d8293522038052259fb9957346296b156aa8ef29b6b7207de3ce4ffdb3af41bbef4255a9f73971eb15a2513c9901fb3
 DIST linux-5.4.223.tar.sign 991 BLAKE2B 83aff68008cb382f7d6a9be93ecf6737cd3dc7d7291da646b24d74f9930bcc072bb4033a54d4c9cf0a3088ab908995f61186ae84c05a4b9f3834ffed271ed7ff SHA512 e9fb0e7fa915ffa1b72a9f9e447fb4afb834611921bb5e12ee6b7291385bf8e3d6113f7d9c3587cacaacb14acd8fbeb067eef1f44ef90be40ce8ea6b1cfd3e09
 DIST linux-5.4.223.tar.xz 112946132 BLAKE2B e5669ba0e0e05d468eb8671da24fac4188a6cdbf66201d3a4c66759435997be541994dee2e3f297f6968857c675dd9c6485efde87f9421f7cc0618b692b005ac SHA512 45fb543b2ef59be495106e253bbb2249fe71f9727a9a7d7a16738820db12f9fb5f580594699f736d157f930cf3a712e09595689a3f9954cfebbfa99f04ffc681
 DIST linux-5.4.224.tar.sign 991 BLAKE2B dc31a065cb747f537923a743d84a473e3724413141242a351d684b155578272156e4476646f3eb5b5bda2fee190604234294a155faf72d7075d60cba32d4b2a8 SHA512 13a8c4e7b2500ae32b22c0fd49f447a3ae2cb673922ae8ce478dbd713aa09acbc0f7ac2356d1d9303a537dc1710d485d50c4607e6f98ec7055604e1fd4b44ef5
 DIST linux-5.4.224.tar.xz 112963056 BLAKE2B 8fb9e729fb6642c5824b32f28cbdcc774d1dd0c1240dac4644aa7030a6171f4f4795e92eef6aeb03f4e92acd26a4ac8fd785ed76610ef63c83a61067b7264427 SHA512 fc54140a20eace0d2191b2ce99415459c16877440a37d101cf628fd92f224536d1f5fbb1f3d2ccb07204df577aea06c913ffcef974690cb93c768991a8bf160b
 DIST linux-5.4.225.tar.sign 991 BLAKE2B 7979abcf47899c61a9a661d73bcb07b097507e3e2ad41aecb8385e445fe64e2d59053b9fb5f9a1db43f4c1104bb05c860a9522b89db5bb4b811983dfd93bc75e SHA512 5096ae43b0773d3ea80637b8c5a5816ddf45f4d48af9bcd5970e2ed3543c678a1db5232834107fb308f2043ab0d5a7684ffe19807900e3d3e0de9d50f63d8365
 DIST linux-5.4.225.tar.xz 112975708 BLAKE2B 1fcc64d4a71f4c1b9ae282fabd37a542f53b78b023cedf657a9649b5a1091b27677acee778c28b7919dfb634e4e2494f868ba7ceced2ae4fc5f3d901b9b02b2a SHA512 2519e9ca893014253e7af9e1e99168693c50c2c39a819a65105dc70f5ad6906d9348a61009c0575ffccc625b7df49c6e1c51bd141bf7b9f64c4ad9f5a173ed4c
+DIST linux-6.0.10.tar.sign 989 BLAKE2B b61afc42b98f495da3e93ad800a8256fa330c5538e52a68ef4bcab382e3a0dc423e89024b2840e7063857f3db82ceaa06ec21d84f8efc51c65c1090e12de7a9c SHA512 90a8d3cec46b748eac6113e338fd26f19d2e4851487361ab38fe2d6a6abd0f6afc8db18d913a0978a774f26297cad944fd5f0dbca9a176462a2995742b7d76a1
+DIST linux-6.0.10.tar.xz 133913388 BLAKE2B f061e3f871e5925bbe8f829c1dd7cac72afcb59fa2fc76226268c32eb990c8637b7dadf56c9f9608f0828debf8a7af519b7f1aa2a37e82d64b97f4f95bbd3f76 SHA512 f25b2a778be1f0879b152ce01d33c344e6fcb670b48d85d6d287a2d3b244fd248b0b775639cf8101c166adb19f8daccaf0e88815b5efefb6355ff2741a1888ef
 DIST linux-6.0.9.tar.sign 987 BLAKE2B ccec935f65a836b1f646eccbb453312b4f9e84d06e4f3aa33ed7b8aae03fd8c3f4e505c6560dbac58d2741df991cfab43c014b6175fe94014f758aa434502a44 SHA512 5d5ecb51ae1a0e40f7b505fc14a6a5665efcefd7363dd9d71bffbe4a72ed2498a79d99c1ce7f80712d8cf753d2bba5f0069447385be74994638657b5a4bc7fbd
 DIST linux-6.0.9.tar.xz 133911648 BLAKE2B 23ad9036cc771135c4f6bcb17950ec61e182981c4bff596062aa92cfccc66c316b35598e7a162ca4c346ca6b18796e2c5fd8112b05544fdde062faa0c3a82305 SHA512 8269caa07b39c668085c9e956a6924c93b698fef7a927ba59a85e615b4be6828b10dd72502e9a1eedb5a4ef1a271ca78a5dea255be6dd0960536e1574ef7f678
 EBUILD vanilla-kernel-5.10.153.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7617ee5c663b367b096292bd58e9b66905d1d40a8325714668ba3e04bf1d21d809950198aefab7b63b152c685f08b9bc497f SHA512 4bffc17a9a76ce0fd938ddd272587a294719262af38165686bafaa48a7a543068817b0b5136365e512a0f141bad06d545ded287786afb89df3bcd253280f30ff
@@ -44,11 +48,13 @@ EBUILD vanilla-kernel-5.10.156.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7
 EBUILD vanilla-kernel-5.10.9999.ebuild 3234 BLAKE2B d1ae98cbcc1aa58bb90e787f61a60a3a1f5936fc7667d2ccf9d441c1445bedeec835e40609c28b586e199adb2ea75b68b01b1422d712eeef6d8129c516afa935 SHA512 304afe6d49b898671901bf8d8ebb380a4adb774d3263ddb19b8797d97708badb281e5cff02ef95392057be52e13004902d59fe5d91f5a2d7db0a734ec91a321b
 EBUILD vanilla-kernel-5.15.77.ebuild 3715 BLAKE2B 5f9721371b3ba0e5498b275fa2ed31fdb6f640e2506d4d246076460f085f33f1850adca9db07260deccd65b92c94488f60625b0f8fdb66d9294ae2a697f16493 SHA512 84eae31a460385f9508ced76a7f3f02be83a2283e6691fe94b56a8e68bacaa4c97604dde3691903195fef01ab5e1f55063421c895aa8d1737adca071aabd9477
 EBUILD vanilla-kernel-5.15.79.ebuild 3715 BLAKE2B 5f9721371b3ba0e5498b275fa2ed31fdb6f640e2506d4d246076460f085f33f1850adca9db07260deccd65b92c94488f60625b0f8fdb66d9294ae2a697f16493 SHA512 84eae31a460385f9508ced76a7f3f02be83a2283e6691fe94b56a8e68bacaa4c97604dde3691903195fef01ab5e1f55063421c895aa8d1737adca071aabd9477
+EBUILD vanilla-kernel-5.15.80.ebuild 3715 BLAKE2B 5f9721371b3ba0e5498b275fa2ed31fdb6f640e2506d4d246076460f085f33f1850adca9db07260deccd65b92c94488f60625b0f8fdb66d9294ae2a697f16493 SHA512 84eae31a460385f9508ced76a7f3f02be83a2283e6691fe94b56a8e68bacaa4c97604dde3691903195fef01ab5e1f55063421c895aa8d1737adca071aabd9477
 EBUILD vanilla-kernel-5.15.9999.ebuild 3234 BLAKE2B 996eac76e626ce6dc0a984e1edd9a0c0b7e5676c1a7537ec30f49041658600daccef70fbf325611dc1001ab5e73c24f5e107f7d78bc7460b911636c38c13e0f2 SHA512 505cee407fde3af7ba4cd631f743df29a1770396828de0090b1fb371eae3f811754bef70f8f6f61bf8eb2505285fdf93dbfe600d8fadaf5f0878a557388060e8
 EBUILD vanilla-kernel-5.19.9999.ebuild 3354 BLAKE2B 7d153d91d316f3f1a27a4f44d3b0d455182b046d0db44bf34adc00bcee00cda1e23cdd359bc655d8b67c74763cad8364a582c28fc57626e0ffb836ce4eeef369 SHA512 de41900154fc4c6e44b63e68caa6d87c60934acf4453b122103f1e655b10b23c601365af65d1af45246c4fc3cd763ab73bfd828e118398ec5b09d0c5b69d3f08
 EBUILD vanilla-kernel-5.4.223.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8806b7e10af269041a7ff1d3a8d7b3df4ef767ebf12829b57d32892d9795619e946a574b704004da55b6f8641e71d832e69 SHA512 5068ce6fb368e17c40629eedc4cf78a7a5b9ca50b102d0378fe0022eeaba14ef710da4f5b31c7021b013c7745fcf52c569bc0bb11c8cb3de038a6f150680edfd
 EBUILD vanilla-kernel-5.4.224.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8806b7e10af269041a7ff1d3a8d7b3df4ef767ebf12829b57d32892d9795619e946a574b704004da55b6f8641e71d832e69 SHA512 5068ce6fb368e17c40629eedc4cf78a7a5b9ca50b102d0378fe0022eeaba14ef710da4f5b31c7021b013c7745fcf52c569bc0bb11c8cb3de038a6f150680edfd
 EBUILD vanilla-kernel-5.4.225.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8806b7e10af269041a7ff1d3a8d7b3df4ef767ebf12829b57d32892d9795619e946a574b704004da55b6f8641e71d832e69 SHA512 5068ce6fb368e17c40629eedc4cf78a7a5b9ca50b102d0378fe0022eeaba14ef710da4f5b31c7021b013c7745fcf52c569bc0bb11c8cb3de038a6f150680edfd
 EBUILD vanilla-kernel-5.4.9999.ebuild 2574 BLAKE2B 6a8f6619bc9a88b8076a80ad6158b8996544b2608a78571107ba0b7be09b5f35add48d99d54ab6a2232f110156df1cbf6f325da036be23c793b4f84bc0f995e5 SHA512 c95bf760e931180ca9cf09c91e7fe05039f2aa2d743ddc8aa3e14d765928d40fcea628754e0177cc66df3fddc0fa2fed54d962e8682c5aaa7fa416f0fe3ac323
+EBUILD vanilla-kernel-6.0.10.ebuild 3833 BLAKE2B 7c090455c5ac0a6b565f9cab974114e41bca494d7d95bdc18c2579d24253cd15919173dc25c53de1f03f7165cce7596e8c615d5244e4f5881f63557900b765be SHA512 b4e7c79adff4cae9d2a515fa71f2f59cbf40eda3ce5c1f71e0ab3235a84baad434d531bd1bebaf853ffcf9ad3709046f477254849e1e310eb937be86d29cdd1f
 EBUILD vanilla-kernel-6.0.9.ebuild 3833 BLAKE2B 7c090455c5ac0a6b565f9cab974114e41bca494d7d95bdc18c2579d24253cd15919173dc25c53de1f03f7165cce7596e8c615d5244e4f5881f63557900b765be SHA512 b4e7c79adff4cae9d2a515fa71f2f59cbf40eda3ce5c1f71e0ab3235a84baad434d531bd1bebaf853ffcf9ad3709046f477254849e1e310eb937be86d29cdd1f
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.80.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.80.ebuild
new file mode 100644
index 000000000000..e9d460c7094d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.80.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.10.ebuild
new file mode 100644
index 000000000000..d2f94947b12d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.10.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.0.8-gentoo
+GENTOO_CONFIG_VER=g3
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index ba29cecd9884..cd7581cf96ec 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index a377e5b4702d..d125b9dbb9a6 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -3,8 +3,10 @@ EBUILD dist-kernel-5.10.155.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a
 EBUILD dist-kernel-5.10.156.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.15.77.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.15.79.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
+EBUILD dist-kernel-5.15.80.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.4.223.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
 EBUILD dist-kernel-5.4.224.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
 EBUILD dist-kernel-5.4.225.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
+EBUILD dist-kernel-6.0.10.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-6.0.9.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.15.80.ebuild b/virtual/dist-kernel/dist-kernel-5.15.80.ebuild
new file mode 100644
index 000000000000..5594b4186dc8
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.15.80.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.0.10.ebuild b/virtual/dist-kernel/dist-kernel-6.0.10.ebuild
new file mode 100644
index 000000000000..c2caefd6cfca
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.0.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index d1c6f258e889..aae207db6dfe 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 9ddd0e0d499c..f4f7a87d778b 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -10,5 +10,5 @@ EBUILD apache-2.4.54-r2.ebuild 7923 BLAKE2B 41b3e091d8b06f114aa9ccae5861b56a8d4b
 EBUILD apache-2.4.54-r3.ebuild 8000 BLAKE2B 6c314bfffd06f463fb7920a7db83268a8709eb87bfe5fe11682d24de3ea7973538dd5b44e840a2cedd28971dc0abe57d03706dbb4b2d928d6ea25bc2d4d3d535 SHA512 9d1505706847510270b4a63b10b5ac90b8c61c626a7566a5d13f2bde18224c7784fe817cd0d2c90769c162011aaa91d40713a382b89b3a21384fd30df6504f99
 EBUILD apache-2.4.54-r4.ebuild 8000 BLAKE2B 6c314bfffd06f463fb7920a7db83268a8709eb87bfe5fe11682d24de3ea7973538dd5b44e840a2cedd28971dc0abe57d03706dbb4b2d928d6ea25bc2d4d3d535 SHA512 9d1505706847510270b4a63b10b5ac90b8c61c626a7566a5d13f2bde18224c7784fe817cd0d2c90769c162011aaa91d40713a382b89b3a21384fd30df6504f99
 EBUILD apache-2.4.54-r5.ebuild 8056 BLAKE2B e02d3a3348ed919bb8778931b813d5fa84c7a67714cff4c8499d0b77927f9b55f25449ab091a95e52fb6f6a988bd6e446c97039bd9b440e2dbd6e1c48ac8db1e SHA512 e47001ac3cb50ad41a8a02745751956aa13c68fa074726d48bb1e1ec4083ac180b26ada81edb4cf4f66c3e72a62ac6256217cd5cff17d2461d2ed69e3bb3636f
-EBUILD apache-2.4.54-r6.ebuild 8060 BLAKE2B 83c3d9592677ff9a04cf9f89b6ad5a8ffce95ad7e3251ead2d8d32821f21b2da491e746a257941649e4efad264b10131bd778e9c1943e69213232ded195a068b SHA512 4f8b8f585f40abf7b5689bf8ed1fe286da25721d5a4a16f8dc34812192c9d73dc38a86b5178bff0003d0058c14674c4909def29b6548a416dbabf20204f572b1
+EBUILD apache-2.4.54-r6.ebuild 8059 BLAKE2B ff957b35e65bd4b956f16643b9e6e239acf23537f981aeba2bbd866feab9b86a11b5fe200612ff90d27393bd7360914f8e9c554077e86d7ba10691754af385ee SHA512 38fbb15cf0c2f3d2430dcdb8d8a8577928b9c9a3054b53000f50db593ab02690f0fd8b2b83088198b5bf3e1f6f180090f25c22cf8879bf18853aa7c50cb6a281
 MISC metadata.xml 978 BLAKE2B 2b2b82339fb2419da3d4e9d77f2c4495235b04a8f5006e61316bf638f307227ea26e2f9eaa26fca5d10118ebdd0bff9fac7319687ae62e2440b49e509e7080e0 SHA512 4a1842f1754473f7168fd38ef4ac2720fddf0f4ad8bfc5df3215b7a50f454cb3fc372e5a84d030a2b84e9744d599f8a38caf3ad5688a93cee7d52bac3d89b43b
diff --git a/www-servers/apache/apache-2.4.54-r6.ebuild b/www-servers/apache/apache-2.4.54-r6.ebuild
index b914bce53af9..cf768ab82603 100644
--- a/www-servers/apache/apache-2.4.54-r6.ebuild
+++ b/www-servers/apache/apache-2.4.54-r6.ebuild
@@ -144,7 +144,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.54-no-which.patch # bug #844868
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 5aa4aba6db15..746894661ced 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index b4bf09f17183..2ea6d2a0d99c 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,7 +1,7 @@
 AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
 DIST motif-2.3.8-patches-2.tar.xz 4068 BLAKE2B 5466f824d71edd1d787eebe5b1fa09de5b52ffa20cdf733301722c4f1d7509af8084f226d68dcba14c2e8d15d5b1ea7d49e408eea8f710af3c0b27c86aba444c SHA512 27e10c2a5b3dec8597acb04940bb8e000fc43c325e5b6f578246ab4187ef34264940369bff1e9c999ba967e85e093434e16a447f1d4da805d0a5ab1576e5ef80
-DIST motif-2.3.8-patches-3.tar.xz 4520 BLAKE2B 23c9814422ef66dd21d0175aa0d180bf0563ad3e67ef9a18121658231392902005afa94e990853b570fb80ef62cf09f1b5dfc62594db4beea1808933d1e9edbe SHA512 46c3177f0d9d12701a4ca7a33b6792c545d61f41421abc911c21e17842e88576d37bfa86dc882e55b50e7c73122c49f5d6bc32f42dc72b3f5f4feacd37857de8
+DIST motif-2.3.8-patches-4.tar.xz 4664 BLAKE2B 3f5b6f1f2196f0043586e6f58adb729cfa43756fb54afff3ddb68a6187dddb97def12a6b5bd7596b466783a502a134fea81ac18de9754ad73c5b70eb23e3ef26 SHA512 74310f26bb8c83740b8b5c20029b40d6d095ce58b61a053b751641b763ac7bf544f69be83b5b3c20caee1f247748905d6b781f53b129e24fa6a4d31cabda1b13
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
 EBUILD motif-2.3.8-r3.ebuild 3069 BLAKE2B 9307e5b02f9c392ddf65f7b5372557eac4ef68b8b2d88213956c70698a1dcbb8ad062c88de8509e6a6b04a316fab6391f91d516fed136a688c121fbac8f7bd49 SHA512 6db4e4edda6ca0b19c0b2c4c590d270eabfe9572a6e152ed1af3a19197e8ee8a501e683b263d1bd0ca246d448c321084327396c0d7dfd8c9290464cba798ccc0
-EBUILD motif-2.3.8-r4.ebuild 3161 BLAKE2B ee9399e72e4a2474edad593c481fd52fd29438ac9bbee77e872b72cec60b9c50f19bdfb325544dba55d7afaa716e1538bf1251cd82f007ededea7db84457c7f3 SHA512 11aca907745a682a51e6fbb8759df91eb3732cbb6b53c981895e6bef1719ef5214012ef8ead7856e0ef74b8177a89cb632570a63edde6a2830a3e83420581dbc
+EBUILD motif-2.3.8-r4.ebuild 3161 BLAKE2B 70c6b3c7de24b8b5d067762d98790939fd85628204b75bde667968cedf443f34f9b6b37a7a12ea4691a085f6082c10795f30ab339c08d44fd025d6d4b4416d09 SHA512 791c8256939c8782c36f372ef4c9e9c159a2c5d3d15efba647d8563266f131cb679ae300b814b89e81ed90f89d230f13a69975cea11272cbdc1b7d980ab6073b
 MISC metadata.xml 445 BLAKE2B 4cfd68cffe9f6c0fdccff74526669d1585ce47949682b911becb4508f40a13493be2a55b5cff6a90c0c9556b330a96bb478dbef2e1b16e4f4baf7a323d88ada3 SHA512 d8ada4a3a14db837ab11752d55bfec960de6a631fd4bbfa569dc4a09d8b3ff3f6908339888e83ad56c716ae9d940111c36030db870f2765b86db2303ed2fbaba
diff --git a/x11-libs/motif/motif-2.3.8-r4.ebuild b/x11-libs/motif/motif-2.3.8-r4.ebuild
index 36c24b444eab..693e697bac5b 100644
--- a/x11-libs/motif/motif-2.3.8-r4.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="The Motif user interface component toolkit"
 HOMEPAGE="https://sourceforge.net/projects/motif/
 	https://motif.ics.com/"
 SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
-	https://dev.gentoo.org/~ulm/distfiles/${P}-patches-3.tar.xz"
+	https://dev.gentoo.org/~ulm/distfiles/${P}-patches-4.tar.xz"
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 03471889c40f..4a4a6f6fc7f2 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
index f54849752a13..69571b9807d7 100644
--- a/x11-misc/grub2-theme-preview/Manifest
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -1,5 +1,7 @@
 DIST grub2-theme-preview-2.5.0.tar.gz 202863 BLAKE2B 62d83cec805f7b65f6469ba22849c4b5cb0e4b845f9bfaea7aed6b05a997fc8d15b8804b2fe0bb75b0ad40f39ed215e8bd711cc4f7bda6f5decf66f38e4f0213 SHA512 83780bc581b3194cda6a47460e16ccf6cf520c8c9f52c19f8bd2779b5ba7e834c83821da47439d8d110770b573424a69ab0801a680983325e8fd6652d7a0652c
 DIST grub2-theme-preview-2.6.0.tar.gz 202962 BLAKE2B 61349270e339a4e82efa57c5ff67bc23e07eb94744a0539e544ce21ec6db26525938403e053af2d07e00f7bb2c75e801f6c688c149858456bf0d794030a72287 SHA512 9a2fc6a9270a10d00c6a7a711a28264f188cd15ca4bc1a84a80cf9e9255af824f65cac457db9a4f78bd0d8c954f7e1a8a4ed51b43e8b6949fabb267dcc2d0f16
+DIST grub2-theme-preview-2.7.0.tar.gz 203112 BLAKE2B 6279ece40999cea94c04396b4b6161bb90b060b5cc2d7573367d52d42321c9d598a839e9c6cd263b8aef5022a6296d9c5ae5919b0a228456b85e027ec059cc8c SHA512 4ea79b598342b60d1ff1f54eb27b1c4c92fa2a74c874a7107b6dad0aa0838a41e9e033a0f44a87307c0a5022c782b2fc51fa15f8599a63d2d5e10ac4e5b137e1
 EBUILD grub2-theme-preview-2.5.0.ebuild 766 BLAKE2B 5303fa5ae50dce7cefc3e3dca8fccad290589e2106ac71fc55ddff8dbf77c5d389d243b397c5454a917473a87c2ec368c720f937b0dc03cb47320c498fbb1413 SHA512 5a4d9efe7dc4296666c3659104baed5acae8a827f1918a59ac682b3c2cff13076ef7b9ae3e744aa0e5e69c6d0e0e00213173ac2352b1acf872abc4f6537c6c9d
 EBUILD grub2-theme-preview-2.6.0.ebuild 766 BLAKE2B 5af9f46589bf40cbb78120b75171cc78fbec0a66322b3b3f6f552d8fd9583b63dfbd3d41e787917086354f1a492fbfab56d6cc6dce83188c62d367d95ff1dae5 SHA512 9e430ed85c41fcd1b81086d0e652a4255a7eb9a8876ff97b249435c2f813650f3e46c15db1de315cd8a80909ef2f5ac0c5d973795f4a63ccad7549d97ae836a6
+EBUILD grub2-theme-preview-2.7.0.ebuild 766 BLAKE2B 41dfe395db6c3b816b4448ace4128e4282035473ac28cef25e6850a639fa88f84b0cdcb8e49194e1644d2153f665daafecfd89452ae23353ba0a5e7a9da0561b SHA512 7464932ea61f6605e12d669721bf31de082e8378798f8d55e47cd406a7562eb52666314866dd6849ce6116bb7f1b3225473bbfed422d45cbd076b762012ceff2
 MISC metadata.xml 343 BLAKE2B 182b8001e5b2011d194d3e7780503bbbcae133841e50bfa3baefb3849c8eabec23075ce12417022f72bf446ea2917283f4ab307aa4acfdb6a9f4f1069e8b5848 SHA512 98c787f18776b403641b87ebba496bf87e607640bc78cece91702f723e21ce3cbd45ea80b13d56876748890c822be47a804534664501d34c9e03418feacce898
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0.ebuild
new file mode 100644
index 000000000000..7dd947ab4820
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
+HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="grub_platforms_efi-64"
+
+RDEPEND="app-emulation/qemu
+	dev-libs/libisoburn
+	sys-fs/mtools
+	grub_platforms_efi-64? (
+		sys-boot/grub:2[grub_platforms_efi-64]
+		sys-firmware/edk2-ovmf
+	)
+	!grub_platforms_efi-64? (
+		sys-boot/grub:2[grub_platforms_pc]
+	)
+"
+DEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index 582393c9a811..3fb99c168286 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -1,7 +1,5 @@
-DIST xorg-server_1.20.10-2.diff.gz 152303 BLAKE2B beb1d07e86378a62bad956990ee210375c3cfa0135acd51e2756c0ddc2933d13092e400a53909a72755b3c1dfb31faa32a137c7ff719fdb8dcc23f11cca72e05 SHA512 c19e16764720b79df53b8032947ca64bb4ca0b9c380d4c2e3317c37b6fa2937815de01e82019ec93921919690c0a5ae1b59bf1fae189d8f7e9e80fb4860fd713
 DIST xorg-server_1.20.10-3.diff.gz 152420 BLAKE2B e87d8800a905962cf3ddeb41e5e9cf0962c5b3ff16ee8ce4d31de96a3d94798fc70dee4ee3f05759d16758f2083436fb91c212ab22f719bd3f086fac51ee5d73 SHA512 16fffd2c92d30c985f55093f46249440388a1eeeca9bd70cd06883f75052170c9717925b18dd01b16ce55d03758bbbf5f2b10c76de00f752b3e7ff64e74e646d
-DIST xorg-server_1.20.8-2.diff.gz 171769 BLAKE2B 5572320e4bc1de63ba221e5c9804d6676cc7c918d417b4069572fec4385d62b73e5636a4f17eebb1897f410e323e190dff68056abd888373df4ccdd688ed7c47 SHA512 89115023fc802a3cf2fc21fabed4499112b1e6f52967eb134795f041194b05d86c59b1477d8b9001c2935efdeb64e8a0dd281a43a6252802df2d19349972f7d7
+DIST xorg-server_21.1.4-3.diff.gz 163364 BLAKE2B 66211f1b0c2332266af6e317ebbb2e21fe03e32b9c3f1ef7b71df045fe0694162aa62b27f2f7e6e6b72aaa365334a0acf98880674111e57d4042c49ac6521563 SHA512 e0a3805a4a4dce9e7851aca586d808723cbca09da4ce3191d1602497469a4240bffb68835a343e28b6eb2a50f7c815fac12378c08bdcc62b88cb488f13d6c966
 EBUILD xvfb-run-1.20.10.3.ebuild 780 BLAKE2B c724ea718f23efcf7f8c8ff5d57897a5083b7f2262abffb26c7a219634367af2b622b2a3ad169d7d6f9b6b65cc14c63c771ca930cfc578e8417e9ceecaffb7c9 SHA512 ff2e5c30eb7b58f6ebcfc31b083bbf2863c2c10ac5b1fc9b9fdc715c2d6f63917175f41b6651fdb6f30b9b65296cacf5169e2dc779044f5f0129ed746f9014a5
-EBUILD xvfb-run-1.20.10_p2.ebuild 757 BLAKE2B 480f78fea0fb293e3656ac40a94833c37cacb294c8dbeaddd6629e3c2ccc329b6f47277926d7435b41c35a33eadafb59bdda731ec006fa93465fd9c7c772f397 SHA512 7948f90a2716af559e6c8028898454dae4d4419e337163ba962e24a72f6d2fed11288a39cee3e0fdd921e1fcdf6ee57072646aa9dee56c2f7ee38a0c301cc5d3
-EBUILD xvfb-run-1.20.8_p2.ebuild 754 BLAKE2B 68043da68ba05bd0e7e054aaed496dd4476ed1c88ebd1f644c9e878b1f92eb5afbb5755799cceb75a027c37965c286c1b1cafe265a0f758b8cae2e3193fb3718 SHA512 c666c2c5b58462cb0a58f90062143e091ae902665825ea1d6c6cfd6a3507501f54073cc050da2a4c8da08105b9c77f18662582d512e22df960d71181f6012984
+EBUILD xvfb-run-21.1.4.3.ebuild 783 BLAKE2B 52ea9b2b92698f680939afbf160bc96b73813196bddc3f2cab189ce325af50fce0a3df71dea89414365aa5980d3f27bba6ae06780733ac1b7e703c248c1c9bbf SHA512 01c11c334d4f0224f8d46dc9bcc466a0ba8ed03f27ed249663cce2e4fd4a8f640f5c5530bf23f6acd5723ec276834f6ff4c6f6a0f8781b1e6b26d8eb3251b280
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.10_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.10_p2.ebuild
deleted file mode 100644
index 8e246007a204..000000000000
--- a/x11-misc/xvfb-run/xvfb-run-1.20.10_p2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=xorg-server
-MY_PV=${PV/_p/-}
-DESCRIPTION="Run a command in a virtual X server environment"
-HOMEPAGE="https://packages.debian.org/sid/xvfb"
-SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-util/patchutils"
-RDEPEND="x11-apps/xauth
-	x11-base/xorg-server[xvfb]"
-
-S="${WORKDIR}"/
-
-src_prepare() {
-	# Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
-	filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
-	eapply_user
-}
-
-src_install() {
-	doman ${PN}.1
-	dobin ${PN}
-}
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.4.3.ebuild
index 99fd0aba31d7..2d1dd7dabee1 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.4.3.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN=xorg-server
-MY_PV=${PV/_p/-}
+MY_PV="$(ver_cut 1-3)-$(ver_cut 4)"
 DESCRIPTION="Run a command in a virtual X server environment"
 HOMEPAGE="https://packages.debian.org/sid/xvfb"
 SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 476e33f31b68..2d3a15feeb0e 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 2b58d27d05c7..3437f6340620 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,7 +1,7 @@
 DIST libxfce4util-4.16.0.tar.bz2 508328 BLAKE2B 99578b898389bd90841a7f903f5473b2ff357cf81256efe1019425b48da32401ce238deffefd299987477f4cdfb77e86e415b55049863c30bf16e0e641e08c72 SHA512 dce6992c3da73367461d7464794a9b2a5503666113682e07a86e18b1c5383de2b087809448d5729097571f4fda6b4af5f4f4600848514ab2ab4b3f367ca26f5c
 DIST libxfce4util-4.17.2.tar.bz2 518831 BLAKE2B 4f1241271edab56063c8e5f3ad6b662a19b08ea06c73eb76e124d9fc8cd9a2b26578517fc6e4b0d5e8c3351877c7b5e077818b916297ac24e273c745cb624eec SHA512 3f079570916c3876373155a3ea15b6326ddadd815efdf7d7abd2ccd9768a96b3191f4e050bb51f2e28bc6b121b7ef9823e7a4caf608398220f527a4df7e29c6f
 DIST libxfce4util-4.17.3.tar.bz2 511545 BLAKE2B 9b198099277b073c67265bca8f63fe42526de6ee7f4d43b0b1c767edcb6f47c29751b78dfe4f38b569cdb3448e8e2eaf3da7556b2c4f09ba6a9a54a0f0946b40 SHA512 b943390b8ffd0b765e945cd1045d97c66203ae77b5c8e0ecd253f527a75fbf07beaea138877e9d4b3e09ad2f89747ebfe3b6d40cb9472e6bdec475309c3ec0cc
-EBUILD libxfce4util-4.16.0.ebuild 1041 BLAKE2B fc3943cc33715dc765858991b9a42396c377e65d556d0d2fee0c630efd09bb50dbc962aa53007fc0290d0f129af7a71c8f911b4737f564904e80bbd4035ce62d SHA512 b464c87b4a85ec3b45b14e159f4f9f36c5ebe2a3bdefcb21c76a901d4435bda8da287605cc399d88b07062c81dc1982be47663c9e6b9ba9044755c079ab19005
-EBUILD libxfce4util-4.17.2.ebuild 996 BLAKE2B eca0d7639495c420ad6427bb193104ff91eccdb503ff6ed444309003c6d5b3ca9b93bbcadc02bec495fdbd76fd61a819d04efe0425fb201ee4e269e341321f8d SHA512 23b42d6d51ccb449736159ff1f243fd50ebcff1a698c305a4681dd2f3369afe4d0ec8a0d0af13ea424e5f477d6da60be707d3f2818e60a8ce050f2b134056f4f
+EBUILD libxfce4util-4.16.0.ebuild 1094 BLAKE2B 5c6da62a80dd1d3d2aaa77b771eea7b3c372d1b60ac1585cd6b40c6c0b36a176ea697522cc9bbbc179d566985b23156497a765871962f3a8dfe14f2e0eabc1d6 SHA512 8ddb4aff9b6c055e2defcb8375a7434db9ca0129ffc9590d937f2d2213f808e8e7ac21a9542888058108c0e237b6e23998de8426b5229549be8eeeffdb80f646
+EBUILD libxfce4util-4.17.2.ebuild 1049 BLAKE2B 56a81fdeeeb58f4e759918acca38202ed7d79b71e33e773787f95ecfc1a268429db0a142526389e78fb20a77905e520f81c7df383c03cc4fc8bd02d1e7c25c4c SHA512 04a655184f926dfe518642f412f4547b7d7ed9ab3775867fdc3d37d72ae102a2bc984242281d8f1c455e8e83dde0402dd8cce33e04fc1e0b1f58c215290f21d1
 EBUILD libxfce4util-4.17.3.ebuild 1056 BLAKE2B 034def2d188f4c372f961153a1f85892a7e7949181fed62ccf657bf1faa89dab92d2ad0757ded89a594b6f1f25c0e45ef0b9c50a4c5579f357aeffd3e409ccb7 SHA512 ed0f8c9475e597b60a2a2f2913ab6de100c1c9c6035529a2c0e48f512b76626ec3a2fb648a07eaa607fe556a2faccbd08addd93d72c2255619c52241a7a58129
-MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
+MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/libxfce4util/libxfce4util-4.16.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.16.0.ebuild
index e430f7b16077..e7ed6027970d 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.16.0.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,10 @@ EAPI=7
 inherit vala
 
 DESCRIPTION="A basic utility library for the Xfce desktop environment"
-HOMEPAGE="https://git.xfce.org/xfce/libxfce4util/"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/libxfce4util/start
+	https://gitlab.xfce.org/xfce/libxfce4util/
+"
 SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
diff --git a/xfce-base/libxfce4util/libxfce4util-4.17.2.ebuild b/xfce-base/libxfce4util/libxfce4util-4.17.2.ebuild
index 1adc34f5d8c2..69faca95733a 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.17.2.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.17.2.ebuild
@@ -6,7 +6,10 @@ EAPI=8
 inherit vala
 
 DESCRIPTION="A basic utility library for the Xfce desktop environment"
-HOMEPAGE="https://git.xfce.org/xfce/libxfce4util/"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/libxfce4util/start
+	https://gitlab.xfce.org/xfce/libxfce4util/
+"
 SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
diff --git a/xfce-base/libxfce4util/metadata.xml b/xfce-base/libxfce4util/metadata.xml
index 2b8ef06e9a39..fb3a6777ad9f 100644
--- a/xfce-base/libxfce4util/metadata.xml
+++ b/xfce-base/libxfce4util/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>xfce@gentoo.org</email>
+		<name>XFCE Team</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 7bcb9c41ebb7..2ad564640c9d 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-panel-profiles/Manifest b/xfce-extra/xfce4-panel-profiles/Manifest
index e0b283af7a22..12c35ba789f1 100644
--- a/xfce-extra/xfce4-panel-profiles/Manifest
+++ b/xfce-extra/xfce4-panel-profiles/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-panel-profiles-1.0.13.tar.bz2 86671 BLAKE2B 0bf2d39aa2d7d21a99a9a7245e5de9e717b628f0eded2736db70cc87c4f6e1e1d10aecdc6586c43c6355747e68a2ceb1920d5309bf38ede07c1167c590dc116f SHA512 648324e5dd95ab0a513829d7d816e2113ae677d9ad6ac9b01d73c6b4105b54d5e773150d5440ad35a37b4dc75478f40a24e0223decf940f3cf658241547ce75a
-EBUILD xfce4-panel-profiles-1.0.13.ebuild 1022 BLAKE2B 1a945cc6f51c0b4ebf7b06cc192a050dd6b7bb5b7c92692bd5a34acf428d4e9ee8087a01da0d08df4b03191271a38180180229deffeadaf40cfe064f555baf3a SHA512 4419d8b900beb1ebc3abf1e217c6415eca08b16b53e948256c445b5055c92c70e8f502cc16576979730c3bed973e2936fbc16e42945a7bb3fe8a5decb7e427c9
+EBUILD xfce4-panel-profiles-1.0.13.ebuild 1077 BLAKE2B cc59411eb91445405bbc647be8d795bd1081662b7887bbc1e6da2286a0377b035fc6959011f5ee74cb9d0b88c06c31b8481dee9c4968ba90274183f533610063 SHA512 32441f4b8252874806ae0ceb84831780cc5e98b8b74dd355e36a09f53c95ad1ded35625902db4e3d1b6ae71d047f74b41fca74591092bd8400119f86c35a3aeb
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.13.ebuild b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.13.ebuild
index 3d82fc01b08a..d00ebbbc233d 100644
--- a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.13.ebuild
+++ b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.13.ebuild
@@ -8,7 +8,10 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit python-single-r1 xdg-utils
 
 DESCRIPTION="Simple application to manage Xfce panel layouts"
-HOMEPAGE="https://git.xfce.org/apps/xfce4-panel-profiles/about/"
+HOMEPAGE="
+	https://docs.xfce.org/apps/xfce4-panel-profiles/start
+	https://gitlab.xfce.org/apps/xfce4-panel-profiles/
+"
 SRC_URI="
 	https://archive.xfce.org/src/apps/xfce4-panel-profiles/$(ver_cut 1-2)/${P}.tar.bz2
 "
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/Manifest b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
index 033479ba55da..0b7be6c36bff 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/Manifest
+++ b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-pulseaudio-plugin-0.4.5.tar.bz2 394671 BLAKE2B facd79419b36741791b91d76da0212a99dfd2e807eedac691a5978b85365052702797cf67d2f0f8af294e9c0141fcedad49a92595acd4bbeadbf470889d7e16b SHA512 9250189af2d40f9b87687ef15e37983a95f797c2ba0aaa18cb8e510b7b1caff7f762a18db4e5a3780001b5cd46e00849d427801e14854c45e849c5d014a1375b
-EBUILD xfce4-pulseaudio-plugin-0.4.5.ebuild 1590 BLAKE2B d4802187f179276be924e5c6494b0251e8d9fefd9efa3fd6df93c1d6f8bdb59388bc2a1ec29cf4b23f318bd2945712c93d5d2059772dda40770bade0aed05f61 SHA512 eadae713915dda6262a85cb9de97b25996bfcedaaabd4e0178fb6fe504f4ee2091306db879e84a34bc5e6dc6a447717d2f05b296b3cc18edcf3124fe978cb178
-MISC metadata.xml 691 BLAKE2B b7db9900de060a5781f5d5c34b640deabdbda817fdd63b5681f3e1db8f8eaefdd2ef02fdcf99499f1d1ba8f389001e375163992890b8266af29cb94dcde3b51c SHA512 2d4520865ce86415c48a9b3c65151c50d846c3995b739cf337367bfe1e5c0ecaf4c9a3950e4f33cb12df6fcce0b26c69fd0c2c810461588afbc66cca6b5fb051
+EBUILD xfce4-pulseaudio-plugin-0.4.5.ebuild 1663 BLAKE2B f9ac6b57f5e7b6e9074254dc2b7c539d68e2716fcf16122b4e5241023e23cb8f9ada34ab5bc79641ca2c8cd52a32bc1551fb3784fa338745cbf8bc9ba7a3df66 SHA512 a3c03e7899b6af967e2ebf8e1945bba2c4ebe355bcfaae4411a175d0f8a39046530a3470635d13d34dc0645dd308302e1c64c88183abd6b4c50d7a04229cec61
+MISC metadata.xml 593 BLAKE2B af2436bc7def50cbe815b6c50cd431594f9107825b0b34e3bd273f414313143bafc5de0a344c4eb658bdef2d5aa772f53e62c8ae3783837cd37c568e4ef80856 SHA512 e0d2e5d8749491de7a5e9a194c7f2b7b0499280c11fc653c711d2b37298e12dc0458c85c8979f680493212eeefadb6fc88d8f20ab672ac1b9616846b95b7ae90
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/metadata.xml b/xfce-extra/xfce4-pulseaudio-plugin/metadata.xml
index 964573c9885b..fceb4d4df330 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/metadata.xml
+++ b/xfce-extra/xfce4-pulseaudio-plugin/metadata.xml
@@ -13,7 +13,4 @@
 		<flag name="wnck">Enable experimental support for raising media
 			player windows using <pkg>x11-libs/libwnck</pkg>.</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">andrzej-r/xfce4-pulseaudio-plugin</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.5.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.5.ebuild
index 1d819524fc96..9ba6c2af60e3 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.5.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.5.ebuild
@@ -6,7 +6,10 @@ EAPI=8
 inherit xdg-utils
 
 DESCRIPTION="A panel plug-in for PulseAudio volume control"
-HOMEPAGE="https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/"
+HOMEPAGE="
+	https://docs.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/start
+	https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/
+"
 SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 76eb4ee2c566..bbbfd1d97739 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-screensaver-4.16.0.tar.bz2 687978 BLAKE2B 1656027af61a50ab97fd3d5744f0ab5f1a81353c64a2fd935a6113dbe2fce5c4b2a22c5f81f15d06d09c3b292f82afa95ce34a07facb5fffef7e6fef712cae63 SHA512 5fa0381395b48fdfb5bdd9b4cafe1ec625d0b7fb9600d59c22c42fe0248fb4b99dd18a94045df3ecdc77635f7271676329c658f25003a9d8d6f9a9a66739dbe9
-EBUILD xfce4-screensaver-4.16.0.ebuild 1799 BLAKE2B 23ba00b673619a7dc31a3322f552c8938a70293cb5d86b6374d8c6b49c4759a61ec9d603150f878074c95262dfbc1f69117906c72248165e529c96e5e0938458 SHA512 b2e61988e84042a317b18644b969fe593228b1f560e0d87f737c772134a8956ddad4caa01559161c7a03cf505883c48a4d3cb2bebe78f21d1536cbeb436610b6
+EBUILD xfce4-screensaver-4.16.0.ebuild 1845 BLAKE2B b2374c9dc0a45d3f562c07a9fdc86bc5dbde30750a4b66849e5bbc06f7116280192b6e5d2189b8ff85dd7710825a7d4e1cf7c119bbd79b2be505e8cc105c62e7 SHA512 4fbad6c6567c0c4bf1a6104ea2143ce89e4a1104ce109ff8b768f2a4e773bdcad648feac93fe3ee6c647e0aaa06017cbd34f1b7046a481fdbf2821aa7a080d6c
 MISC metadata.xml 292 BLAKE2B cc7b9f7a72918097fc69b330b539d32dbae696c757c3a069bbc4514a8ff1f1931d2643ecaba63a28b7b58299fe1064c3425be00ae4c8f23d5413cef25ab738b3 SHA512 801d1715cbf897ea4ff01e49b7675b8522f07917b1e5908025c590fe18ae0d50463144f5d21ef7b33e9b3bac325f4cf96644c54eb62b8aacf7b512c612b10234
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.16.0.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.16.0.ebuild
index 85a4af5ae9f0..0d47bf305220 100644
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.16.0.ebuild
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.16.0.ebuild
@@ -6,7 +6,10 @@ EAPI=7
 inherit xdg-utils
 
 DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
-HOMEPAGE="https://git.xfce.org/apps/xfce4-screensaver/about/"
+HOMEPAGE="
+	https://docs.xfce.org/apps/screensaver/start
+	https://gitlab.xfce.org/apps/xfce4-screensaver/
+"
 SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
diff --git a/xfce-extra/xfce4-volumed-pulse/Manifest b/xfce-extra/xfce4-volumed-pulse/Manifest
index cf8a213537b0..e03fa03b6c8e 100644
--- a/xfce-extra/xfce4-volumed-pulse/Manifest
+++ b/xfce-extra/xfce4-volumed-pulse/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-volumed-pulse-0.2.3.tar.bz2 308063 BLAKE2B e64d2e668bf1a6666ce82ac4f03852abfb0346936a789ce7f89acde1734af948f628ca3c17d515e72ab292fc86525623b8aa0b4a219555d7b8729cee10889142 SHA512 da190cea2b3993717f35e1ded058613df99f8fa223a90d379d95dff0bc9d44f4fba15bd23ff1b54f11218d20518092d14a2f2b808d4984673d3bb77616c2f3e3
-EBUILD xfce4-volumed-pulse-0.2.3.ebuild 750 BLAKE2B 3e4171c4ef1b89c31ff5ed6009069545490c3f6ec0638e9823e6d74850a8fcb1a44f4b094c023c6323c129885835a3ad54d515fa0684b656a1b0e38b21cd72a2 SHA512 63eaed478d5178969da0d849711c3ce7ff60c8016878068b7ffea1442a4eb26d4807cf9775616104ae6933f435fd84b6d0dfb1cd39dae366faab7d19b378b6af
+EBUILD xfce4-volumed-pulse-0.2.3.ebuild 753 BLAKE2B 2791ebfc3bb92d112b2c1545a138a71b2bbe1fb75fc3c3e5e3079e43d21d0985f59a87239796d1024688c317422fc58406f9e274eb4ee44956db01cbcd066322 SHA512 f1e1291b05f3f54b76dee35f658a9a4764809c709c2d5310e575fbad0393e26eab2b0eccd54f9c71fb25d370855fe1502cd97a30f3626172e598edf30f720c05
 MISC metadata.xml 339 BLAKE2B 194b0b5f2931827fafb9348bef2d4ac69680bd4a83c0656eecc80902aae59cdd5c8e23f13eb354f04b5c4367457a2e9e6ce8bd4a6bd9d3d63a544560b61984fd SHA512 22280768a6ea4fcc10e893c27a18fb4258bf0c94e08843f6838f50fd7bf1503efdb7c276f4b29292864901a47d676093714cd377828bb92d45636ed460768a15
diff --git a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
index 3115cc41ac34..e98a24bdab0d 100644
--- a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
+++ b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Daemon to control volume up/down and mute keys for pulseaudio"
-HOMEPAGE="https://git.xfce.org/apps/xfce4-volumed-pulse/"
+HOMEPAGE="https://gitlab.xfce.org/apps/xfce4-volumed-pulse/"
 SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-3"