gentoo auto-resync : 31:05:2023 - 03:22:19

author: V3n3RiX <venerix@koprulu.sector> 2023-05-31 03:22:19 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-05-31 03:22:19 +0100
commit: 3810dd6a469ba3e0014a390d92f1fc220dd20c3b (patch)
tree: b7dd01f1153f84e36981e0ae398c7e047d878cc4
parent: 2f210c93c08515a806199783aabe37d12a0197cb (diff)
237 files changed, 3085 insertions, 1198 deletions
diff --git a/Manifest b/Manifest
index 455ae5f2b33c..4be0960ec57d 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29448 BLAKE2B d79783877c0c129709a390737ec228b632e2474de1bcaef29028530f3d7315ec68d0819b010e63ceb559bf124baf40cc25c4025d0de621a4543527c6b18a26ef SHA512 13c2f129a7ab8fd8b5cc2e4fb87a69d7f93cf7168426e11ce79ed494cf1eecd84bd464e98a220b5fefbcb3244cbe97cceddd19f4f482654744d7a7ce7ab036b1
-TIMESTAMP 2023-05-30T19:40:10Z
+MANIFEST Manifest.files.gz 29465 BLAKE2B 44b40cf0dc4233b8b1b63a7ad673b10b85143a73ded19af474fb79ab61fa19e01841ea8c73e0056304f1755fad431a7bde59dd2ac1c4ce3f5fdb5d8ac359437a SHA512 394be78d53c0039deb5233a4e428586511c0070ce5767d2d8012642ae01baf35ae3020483ae58430b1b46232ec3a31badc2511d750a2ada34ee02464a5cd8958
+TIMESTAMP 2023-05-31T01:40:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR2URpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR2pXlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAjaA//YBm6DN3CU9ChivJQVcoogUKQY0sUNYZtq1qdeQWw2zeJA1s/3mWqFtQ7
-vjBcGaiEjpEGj9Hxr8v1tzLlxovhcgInFT392wiWUBRSU/B/Y+RTCMxfLYSHsppV
-r8cagbLHehLnTJr7zX9JfTF8jqJt+Li8f6woTkpZUXfzlhffWvItItE5Pm8h7bcT
-iXVW2Lv8FrNyZmtqMWkfJypvUn73IPrl6K/6Fjt1TUFXG6TupR/2u+a7UQ9//gxo
-UiXzO8XzQRV+HpNTvC8JM7UTgmGhkJbT/EwOBxWWwnXsCzOZUbDxA2oVx+RdeBEd
-YSSElimJiTwTJ6mzb5igcvGijCKEmFufoGQEBAtZrsy2vvQJK0C+7fIZ1HIOJOpG
-xJ7li02qat9SLTHK3DxSAP3MeNtmr8JbFCE72b3ki12JXIp+3or9c/B4xeaeWZkO
-TCh/hAoIy1ulfe9qztkZK7GoydEMThusxREIApoT2m3XKS4yNsvc9y9bhyW092PB
-fqYIiQ6vFurURkvQgjDzCJKP8U633wLLp3sNQpn8qYoGrBhab2Fa6Sa/bqAIJdC3
-ghIIbKrk1NZhA2G3+L6D5A/rTzs2/aKfCzQ3MDaIQaiIzAEyMgFAvGY204c+5CQw
-P3DxZEKaTRcbMQqiuc9LO5fHRv53z3+VQmcNm0ZqepCy04pjNtw=
-=bfcV
+klCsMg/+OPiWs4Dn7h/wbVGH6Md2zTipszJ+x/GWfciBv/ORhcalsDo7gg8hDE4A
++PHvJ/XRByfML04ZswwJ3Wzc+jc1TXvUAz9HDcKzdu5QS0hdZxhDtwSslso9kUKQ
+N98gdBOjH/zUNtd/haxui0S2dYlt9AR9CDP9q3CtBN3dW/8em3wdYQD5ofHwwWOT
+KF/Zmt+3Bg6FOQL8JSaY1I6lVMIYqgS0RPQ57acr+JcH31kgSPoLkatTqnoBIjeV
+uH/Hwt6HNq7SUUTaqhjAG+901D2nLnn9j/Fg1z41SLbxR6xO0+gqOt9yZS+SA2Zb
+Kwm4d09NDUVSe2b57pJhRoKRkvz4HQwHVx6+M3yl2O8iUn4iOVMw5yzxSZ1dPxXm
+s2hlQH/TXqgSq2LBtTyMgHZxcg//cMlMO+j4+sjRGUcQFTaDhrEUJPogqRkcavU0
+iVrnqZCzCABxkEgZM32p1SOC5+9tHctJj2L8mpZwz1Qigco48j8yp0QChzSa2A4C
+9nu21OXWpYOeNpnMc6dai8ooKt5nucr8PwkTc+aRtzoSEpyMVIDju5C7TkaOL2Gn
+fl+QJYkK/kDIq5ZHyB+dYsaZW00a7KcDIeHQHPc9neT2QPPacbhVZazrEih0pk3Y
+q92sJXrEGKXTleODPkh333Knmn5SbwDCRRVdDipHxuGHb67+O50=
+=z6a0
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index e5ba9674efca..e0f92b6643f6 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 416d7681e6db..cab8b2c5a2dc 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 6aa79c35b3d4..da1640e5f21a 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -2,6 +2,6 @@ AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649d
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
 DIST brotli-1.0.9.testdata.tar.xz 3771536 BLAKE2B e22a7e926a68b64cf3ddcf90d2381201d0bac6486f28c3a675c83a2a685108491011195faf48df9abd478a011e874df560ae81988348f7605197805cc3be20dd SHA512 d98c48dbc7772959a9cf276b638cf773a05a896c9daf4f6235f7d7fd625490b3f538e0690afcd6968ff81ad3745c7d78419850c2518048c44d73b470bcd08c97
 EBUILD brotli-1.0.9-r3.ebuild 1780 BLAKE2B e66fa84dbe7cd5baa3d4438484ca2c09bbd2cbdbd0a5b1f64ef30f2ed3e899f41f97d7651655057d4c0c7a152b045b16cee31197a26827173c447700657feffb SHA512 4dcd91910425916f594e0e3b99e7edfd401823dc43d836857ffe4c1dfd5f689b777d4faffc8ee1d491a5eb6f2c078f51d8cf53099baab2190745fc13f7f9718d
-EBUILD brotli-1.0.9-r5.ebuild 2029 BLAKE2B 87d355ca45618400ce11f8b34f97375d2a3740b9557cde03715f2d2ce8e0a9c347f7d0b7fca7d2481b0c78a0059b31baed8736d3ae0b21b86f3eef6e58e92e49 SHA512 9f611eea09e46fc60778b9603078ef20b2c0fa0f2898536de41d6f5a5e3190539f7aeb123b04f55f796e3e2374256b10da26c5b19a791dac540adeee2a513068
-EBUILD brotli-9999.ebuild 2037 BLAKE2B 1237a8e374e9f12d9abc9d02939d2b8096738c9d3fed92719046705d4f2efe365221d0230265363257e5e3f43deaa7ffaf9f7036add3d1c9e7ec2bc874c7995d SHA512 363f228c332eeec82bba16c3fdbc197125793b576a141c4b6bf37d7aa8338056f24e537e3ee692997152573228b510f1eff128e0037c56817bf5046c9a5832d2
+EBUILD brotli-1.0.9-r5.ebuild 2079 BLAKE2B 4f8b2c3b1b69a5ca78f1a727fc150f6339413b865d07c0ad487e4ad597785fbcdfee12e849caef006690fc7e8a9a28e08f68379c84335824234357409b2337c6 SHA512 52a60700208ef0a3f560274a43a08d67aa98dce8dd5430264a86c6c5d82f4b9011863203ed5b9b3cd293ae18c6a42ab628e4efdbacf7bae66ce66fc56da3f9f5
+EBUILD brotli-9999.ebuild 2087 BLAKE2B 4210b994d36f5bda2a2cbc0566db6b7e0f198e65635edc7b4471657557a295dcb312fe86038aa8ac7434fa5a0c3bfe157a510a7e5f42d24d40652a10b134f10e SHA512 9d088308a12f81c2bff502b11859f97ebfa4e4bec343968398b5d9682c8b1ca1df504cca7eacd4d2f494531d6c47dd7cb19ab460df5a7a92ce9127fb81cb26d9
 MISC metadata.xml 829 BLAKE2B 31c7c9adc087001ef6feb8937752317fe46ab500de9c686cf450a9184574b6e4483214e12791b8a81f9dd591a6a5d1ab9fc6f3997831f1e7805d475ff54ac5ed SHA512 c49f2027ce150e20d76f50268940d0ed231419ad57904d1cfcfa76cd4dd281c89e1c16be907c3140026781ae74266b8f37b9a6455893f8e8d824e8e57281573d
diff --git a/app-arch/brotli/brotli-1.0.9-r5.ebuild b/app-arch/brotli/brotli-1.0.9-r5.ebuild
index bba511397ac0..811396d7b326 100644
--- a/app-arch/brotli/brotli-1.0.9-r5.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r5.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit cmake-multilib distutils-r1
 
@@ -42,7 +42,11 @@ DEPEND="
 BDEPEND="
 	python? (
 		${DISTUTILS_DEPS}
-		test? ( dev-python/unittest-or-fail[${PYTHON_USEDEP}] )
+		test? (
+			$(python_gen_cond_dep '
+				dev-python/unittest-or-fail[${PYTHON_USEDEP}]
+			' 3.{9..11})
+		)
 	)
 "
 
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index f51f268d0cfc..5a1e03ad6871 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit cmake-multilib distutils-r1
 
@@ -42,7 +42,11 @@ DEPEND="
 BDEPEND="
 	python? (
 		${DISTUTILS_DEPS}
-		test? ( dev-python/unittest-or-fail[${PYTHON_USEDEP}] )
+		test? (
+			$(python_gen_cond_dep '
+				dev-python/unittest-or-fail[${PYTHON_USEDEP}]
+			' 3.{9..11})
+		)
 	)
 "
 
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 820587ed9fb1..f7ff20683e0e 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 263bdbdf78c5..2bcb710a2f62 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -8,19 +8,13 @@ AUX gpg-agent-extra.socket 281 BLAKE2B 2b8edd4454fece75535e84a2ee7daffa764395a99
 AUX gpg-agent-ssh.socket 308 BLAKE2B bacd09131082ee4bd440568b68065fb148c90a620e6628796bb9f3a2957a13860d15ce548e39ce10bc8749ebeabd7dcd0e893db49df295c9126078fc3de76619 SHA512 202bc5c9c7f9c4e97f53626c906ea455d6d4497cc03272c52f7b653cb5d5dc23850b85f939b88d04bbe70e309ad007415401298c9d04cb9b60329ad9e550e93d
 AUX gpg-agent.service 223 BLAKE2B ad71d7fab2a92a8da454c34884b5724e94adc0925a7f97f062fb7b78ed3ec87e5babb6383e755c943afd16bf61789ba83455dc2baf82ce248c1c4622ff87e364 SHA512 4a5cde9185fcc34b62880c2e80717075838ef35e63e361d81e329b2b6eb92d69f26f11669722c66653091b36c42bf678abea10e5fc9327ecee2070d0ee51ef25
 AUX gpg-agent.socket 234 BLAKE2B 622da5cb56ac2bba99054b9eecefc95aca523074aff24f77d1fb1fcdb94c1ad99c0411375816a0ac1b9f68d172207ed5061bc3afc167d0d1e3e57de1b41f19ee SHA512 551df5183fccc261505983880010c5be7135a9858d74354723f947163b101b2859ebdfd529f8c3746770394256afedc219ea0eb2df5c985be48f5f45430ca541
-DIST gnupg-2.2.40.tar.bz2 7301631 BLAKE2B c9a077e28b22888573bdd12029205eb5f79a463a297e400a623bc86a39eeb6454cd884d05bd96734998613c695f2c9dcc68963c7275b89938ac38ddc7ba1e229 SHA512 4c2f5fbf37ba6fbad0045aad23129186963010c673ea0b81801adc4f98efe14d6c7228e22815b6b26307c1fe5bb51cd088aa6a0f06a9325d3c021849ef81c594
-DIST gnupg-2.2.40.tar.bz2.sig 238 BLAKE2B f5d54d46b569874b1b210249faf18d6a10003b81cc0e16d4bb26d61ebfcf2fbb9f54d82ee10fe31c24f88538293fb1434640fd4ec53531770777b1109de5df9e SHA512 df7cb13ac547eb9b577b546bb1672980eda5862b02160ae50fe7802c9122c62c0f1a85255bbd33bf795a3febc9ea17402d97123a1f20bfe016edb072de922c16
 DIST gnupg-2.2.41.tar.bz2 7313746 BLAKE2B 0be2965a646a8636a127f89329030860908b0bbc447381782527459aed85f5276c29e7a2c89f87cb715407d9f1aabbf3ae1765073764d05e422035e8d5962569 SHA512 f472e5058ea9881355f0c754a47acd0b5360c36e8976b8563dbc763a7cef792bf88227cc15fe5172d3e9bb9fc34d8448dd5c183949031e91a1997cc7f0f83b55
 DIST gnupg-2.2.41.tar.bz2.sig 238 BLAKE2B 7a4dc8dd4b3da77f6684325f46e3e3b1aeac6fcd8382e3148da1a01a5c5a9e14c1352fb28b61e500388d647e1103b8f78ad49e467e01b732c4a13eb849859b98 SHA512 ac6edd35c6b02a02d6c8a4468332213f20159f972aa2f7fd25c6841c662b3d84db5230330d540e0785ddaff080daf8dd250292104ff47560ad59c11803aabefa
-DIST gnupg-2.3.8.tar.bz2 7644926 BLAKE2B afb960adb877398363d92585d54bccc82c816f87b4489835950c19fc330edbf5302f7f958fdc6333b80d2e34730c9518e6abffea721891fd76c1b2ff2aa704be SHA512 6df8b1c53f0112c358f9f9eac732dd4ca13bcec24fc55a7d4a606587da988c5b7bb4c61be52b8b7769f1536dd2043087e6eb5cf224991cb0b2ed38ad00717ee2
-DIST gnupg-2.3.8.tar.bz2.sig 238 BLAKE2B ea0442109ed6166635b622d352d7476396836b9b7671da3a44b17d04a7a0b9d8dc6e48434c379578466907854ae255d7541064a21eda1a43f96bedf963b699b9 SHA512 e9e6ef800f2ef78e637e7d06c340e0c2e0441a8d065dd7dee484171411be784e6f0e6def634405c5231a429f8d73a1946eba8b1d35d7563e372fe07923ddd4c8
-DIST gnupg-2.4.0.tar.bz2 7666935 BLAKE2B cc4bcd439a3283df5932c0c41873a3b85de07103d9164ec6dc44552fa0d8c5e5973d74dcd3ffd3d4cf0564c9dab66c6e2adbcd7b34bbc4b5faf0f1bf0f3836aa SHA512 094d631130d4dfe4421cc5e715eaec1888d0b4b764f1be9287be86cbc34430313211739d5481b34e9b59021d05cdbae8a87a1007031cc4dc6213045984a8559a
-DIST gnupg-2.4.0.tar.bz2.sig 238 BLAKE2B 745dda62b3e87507d7a64fb32036675038927dc9e8d1c4baadd9117c33d189a01d2cfcb362694f6ca4ef291b36828a9ee4c908ce1ac5f27109efd1fa66bcb662 SHA512 383c3ece4f34fc2a4f4f483ed67f821df9a96597de090b99c5e0f0cac3cf7a0d9422e469fb8b13cf472297c56e989a43463eac5045d167950fe58a38df96c893
 DIST gnupg-2.4.1.tar.bz2 7341338 BLAKE2B 6da4b1ed44f8110421ea465b50a08915231a26ee450c1b11326b9b777772b9ea304ea0c0881e967ca9c6054bc526445951176c50d9a2e24b038c04354c778e59 SHA512 4d6b30ec4b8d786508ec1ac5f3c5b0ddebdc4f60aa72eb5d6ecc185ff0e9f1f4798f80ae16a3d136052b91ec54978ec0b7969a11a6c2727f30b3b6efabbaf388
 DIST gnupg-2.4.1.tar.bz2.sig 238 BLAKE2B b832f8930827ddeacf4ca864279acfb5256427aaa9164ea1d9a98528c4a637d1288269c8fa6a19427b768294a9833dbe3eeb596abb1774864ca92001921f0b54 SHA512 2fead4f71876bf839cffc78def542b2cfd1b76ac207a06d8725dca7e20572969d9d72fc28b0c84345ee56cc57f5e3ff83e79be24eab1ee6db91680ae95447809
-EBUILD gnupg-2.2.40.ebuild 5348 BLAKE2B 6c1cd6b2afe8ae6c6f166325600fba939a77464bde5c42c19d26738c74f4850e3c121e72050af9001f26c970fbc873f36fc27960f7eef285f60c3eacd8985b08 SHA512 d6be263f1018c396b038aaa3df11e87f9265e3805370d6c91b65438fcb2fb66a664aada9eb2a66ea2ac1d53c8aaa582ab73821ef0de2f77185ccc0eb62b76dd6
+DIST gnupg-2.4.2.tar.bz2 7346587 BLAKE2B 7a5aecca25d87f5f531576c8db1629908d97381bc75f69c228ebf7f06f2234ff847e631ad2b4ff35772e0905648b291e79816a4a274616fda5157bd6a88319a2 SHA512 64076146c735adeaf176dab432b13b1314bfb588eb97ba1081c26ae32647d2b099e62f02bb1c66ce672ff1146d1fb9a389cdd17e7b9c2ec674ff1dccb7f46a8e
+DIST gnupg-2.4.2.tar.bz2.sig 119 BLAKE2B da10bc6d93e5bd96572d6e03b99595eb3f3a5e2e53767a235f9e28878a294e6f444c5cee3a44579f6593582e5c4d85e99e963f2eb7ad2d64aa3a54136c39ffef SHA512 d08cb718a8656efb922f2591ec295e678687fe5f3a26459498952d28f4eea4f8368ea896c2908f58e3d3d8ea49faf865a1c146dda1b24f15bf8d37dce3eac868
 EBUILD gnupg-2.2.41.ebuild 5518 BLAKE2B abcaa31dea56b63a50618745aadc8833329f6320403408a7291bcd3de3e9ed2286a9a0285c8a4abda1645246f56b8a0a31789f6ab40a67a6e137c999af97fa06 SHA512 6d5a8a10914c49c6ed65a59dc3f136d2929b98e64f78d3fd47d1242f8ac5729d888256411e96b7d2adffda6e1e2bd29ec1f07ec7d3800e8f52e1683541e9c4e0
-EBUILD gnupg-2.3.8.ebuild 5533 BLAKE2B 7981d90dab147bfa0fe3b6beb81452c02da814d050974b8b1feb2f69b711dbdccf61c80441d3b31281fc833a1812da67241ff22650cada166826bc79bdc536df SHA512 99e9d36bd8ac6a79264793661f3a0c565a7c480689697e82e6f11ecd470f116158b81eb88f4e8bf70f4d7b790b8d05acd41a4576d991e2afacc4781618cc7659
-EBUILD gnupg-2.4.0.ebuild 5687 BLAKE2B 6fa300b65d883cb7070d78f112682321ad066fc3af4b4513e6a6c57e7f83a6495527ca1c5caf1ca36317cd15a06661b2cd545d97897a3f736bc0ddb903d5dd67 SHA512 9c404c9a5e0ba3a2130cb775e8a9904366e4a98423c9393abb7a677d83d076cd29d0f944df30e6a9446d996d956beb5abcaef061e350d9614880bc740232c000
 EBUILD gnupg-2.4.1.ebuild 6065 BLAKE2B 13bf5d706a1db6c17a8fa178271bba7fa92b01fbc1200cba07cb7adb9a8764af94e28f278bae5bebcf0470a54e5e04cb96919c71139348ffa1a1eeeba9938379 SHA512 12bb9c684af775cd014aa0afae35c65cecd679afc8c8027f267030540e02fcdbb8a1555af070174d11948bda2beac7484ddbf6d193693ab42bdf1aa31ff0e1e9
+EBUILD gnupg-2.4.2.ebuild 6065 BLAKE2B 13bf5d706a1db6c17a8fa178271bba7fa92b01fbc1200cba07cb7adb9a8764af94e28f278bae5bebcf0470a54e5e04cb96919c71139348ffa1a1eeeba9938379 SHA512 12bb9c684af775cd014aa0afae35c65cecd679afc8c8027f267030540e02fcdbb8a1555af070174d11948bda2beac7484ddbf6d193693ab42bdf1aa31ff0e1e9
 MISC metadata.xml 1189 BLAKE2B dae783678abfe0bae095970d96d952f591a569debad411708d29a2f128c6a291b73a33ee0b3491a6a5ec44c11f56d33c1531022e0ef9eaad3326c9cd0f79e3fb SHA512 bc7d6a9ceda213c134d9afc527fe0b0c87a4886a171b7a1e1f662f3978fec5e71323bae4c9f3882e1d763d5738446f161265070a8e513a59fa62ef0f792e9fa5
diff --git a/app-crypt/gnupg/gnupg-2.2.40.ebuild b/app-crypt/gnupg/gnupg-2.2.40.ebuild
deleted file mode 100644
index 71f980e5fb0f..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.40.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should:
-# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
-# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
-# (find the one for the current release then subscribe to it +
-# any subsequent ones linked within so you're covered for a while.)
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-inherit flag-o-matic systemd toolchain-funcs verify-sig
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-
-# Existence of executables is checked during configuration.
-# Note: On each bump, update dep bounds on each version from configure.ac!
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.8.0:=
-	>=dev-libs/libgpg-error-1.29
-	>=dev-libs/libksba-1.3.5
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap:= )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
-	"${FILESDIR}"/${P}-fix-no-ldap-build.patch
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable test all-tests)
-		$(use_enable test tests)
-		$(use_enable tofu)
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-gpg
-		--enable-gpgsm
-		--enable-large-secmem
-
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	# bug #663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	# bug #638574
-	use tofu && export TESTFLAGS=--parallel
-
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.3.8.ebuild b/app-crypt/gnupg/gnupg-2.3.8.ebuild
deleted file mode 100644
index fcc35533fe5d..000000000000
--- a/app-crypt/gnupg/gnupg-2.3.8.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should:
-# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
-# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
-# (find the one for the current release then subscribe to it +
-# any subsequent ones linked within so you're covered for a while.)
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-inherit flag-o-matic systemd toolchain-funcs verify-sig
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( tofu )"
-
-# Existence of executables is checked during configuration.
-# Note: On each bump, update dep bounds on each version from configure.ac!
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.9.1:=
-	>=dev-libs/libgpg-error-1.41
-	>=dev-libs/libksba-1.3.4
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap:= )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	tofu? ( >=dev-db/sqlite-3.27 )
-	tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
-	"${FILESDIR}"/${PN}-2.2.40-fix-no-ldap-build.patch
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable test all-tests)
-		$(use_enable test tests)
-		$(use_enable tofu)
-		$(use_enable tofu keyboxd)
-		$(use_enable tofu sqlite)
-		$(usex tpm '--with-tss=intel' '--disable-tpm2d')
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-gpgsm
-		--enable-large-secmem
-
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
-	fi
-
-	# bug #663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	# bug #638574
-	use tofu && export TESTFLAGS=--parallel
-
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.4.0.ebuild b/app-crypt/gnupg/gnupg-2.4.2.ebuild
index a8964f482315..824453c2bd62 100644
--- a/app-crypt/gnupg/gnupg-2.4.0.ebuild
+++ b/app-crypt/gnupg/gnupg-2.4.2.ebuild
@@ -72,6 +72,18 @@ PATCHES=(
 src_prepare() {
 	default
 
+	GNUPG_SYSTEMD_UNITS=(
+		dirmngr.service
+		dirmngr.socket
+		gpg-agent-browser.socket
+		gpg-agent-extra.socket
+		gpg-agent.service
+		gpg-agent.socket
+		gpg-agent-ssh.socket
+	)
+
+	cp "${GNUPG_SYSTEMD_UNITS[@]/#/${FILESDIR}/}" "${T}" || die
+
 	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
 	# idea borrowed from libdbus, see
 	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
@@ -79,7 +91,7 @@ src_prepare() {
 	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
 	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
 	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+		-i "${T}"/gpg-agent-ssh.socket || die
 }
 
 my_src_configure() {
@@ -171,8 +183,9 @@ my_src_install_all() {
 	einstalldocs
 
 	use tools && dobin tools/{convert-from-106,mail-signed-keys,lspgpot}
-
 	use doc && dodoc doc/*.png
 
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+	# Dropped upstream in https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=eae28f1bd4a5632e8f8e85b7248d1c4d4a10a5ed.
+	dodoc "${FILESDIR}"/README-systemd
+	systemd_douserunit "${GNUPG_SYSTEMD_UNITS[@]/#/${T}/}"
 }
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 0055c3b856e9..1280da15a75f 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index f40809183ae7..5966b5213008 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -4,8 +4,8 @@ DIST go1.19.9.src.tar.gz 26556330 BLAKE2B 2eb6bfd4456b4f4c7f3bcd794bc40015e1d7dc
 DIST go1.20.3.src.tar.gz 26184364 BLAKE2B faa9cf8c141d013955d3582d5cf1a43ac0d89c2a7ceb7ab00e10aeacedc3bf1c324d62cd17dc6299057cc9acd347ec7672c7f9acafc1b926855d953ef2bac8d6 SHA512 47ebb3925956a3facef9e5e6f4efec3058e55632020ea247844c55b160d23e2be3880ea24dec2f73382a7c7858259896cbb7de1bb764c481c176bed479676029
 DIST go1.20.4.src.tar.gz 26185429 BLAKE2B 74ddecc43d53ae9ba9429ec7797061d96b114e24c7cd3bd60546c1161362ad449dadfa3ab53a0783737a4cb36e6724b66977ed554e7f724c8bfe2f3a083b02c7 SHA512 43898325bab48c24e533f360a2c7de356a8a56946602e727b5bcd4a62ff4f64fd750e2650032f7e0525b0699e40e506d79446e16838f097e6bdc2a16f10d81be
 EBUILD go-1.19.8.ebuild 5233 BLAKE2B 86b49ba0ccc71624134e67f3e97db2b58460835459080228ccaa6a6b043123bc4592cf8ac180d8e67eebfe0b6aaef0bd48c5e9358246099c20668181301b7842 SHA512 10577e3953f04e5998acce259355643455dab7e67bd42efa5fbc4d2aeb91d0807acdb3c59813f2d69acb853e7f6d6d2fcb3cb72e2ec9834dec5ccc6f6a50a7ba
-EBUILD go-1.19.9.ebuild 5235 BLAKE2B feec7ff92b8e32271235bd796c71f78f52e3c90c754d85496742564b4ff0b37fcf21fdf692f097c4298b36e5a3932349dace9ea3e1e91e4f6e632484ee2fb75c SHA512 63f5f1ae9a0f26e400d847df01ca9dad27dfa937e027b826098b63fc83e89665565e1308e7832eab2bd6e04eacf49d8704d2af2b2624db6b7782784d86957cad
+EBUILD go-1.19.9.ebuild 5234 BLAKE2B d017f18d2b8f2b3f95f5a8a84a294dc6d8779cf701a14e95d010f43027030de9290cbc05f7c92c95dffa938aa06477c92289ef2f76baeabc77dec91a7b5fd795 SHA512 129733230a68c6a019937dcc4601a1c6d1f23c22e2fda8b3ff55e366307e94703c532c0031f87f0585588177af15ad1425777d7e7fbe035414f11d94abec13eb
 EBUILD go-1.20.3.ebuild 5233 BLAKE2B 86b49ba0ccc71624134e67f3e97db2b58460835459080228ccaa6a6b043123bc4592cf8ac180d8e67eebfe0b6aaef0bd48c5e9358246099c20668181301b7842 SHA512 10577e3953f04e5998acce259355643455dab7e67bd42efa5fbc4d2aeb91d0807acdb3c59813f2d69acb853e7f6d6d2fcb3cb72e2ec9834dec5ccc6f6a50a7ba
-EBUILD go-1.20.4.ebuild 5235 BLAKE2B feec7ff92b8e32271235bd796c71f78f52e3c90c754d85496742564b4ff0b37fcf21fdf692f097c4298b36e5a3932349dace9ea3e1e91e4f6e632484ee2fb75c SHA512 63f5f1ae9a0f26e400d847df01ca9dad27dfa937e027b826098b63fc83e89665565e1308e7832eab2bd6e04eacf49d8704d2af2b2624db6b7782784d86957cad
+EBUILD go-1.20.4.ebuild 5234 BLAKE2B d017f18d2b8f2b3f95f5a8a84a294dc6d8779cf701a14e95d010f43027030de9290cbc05f7c92c95dffa938aa06477c92289ef2f76baeabc77dec91a7b5fd795 SHA512 129733230a68c6a019937dcc4601a1c6d1f23c22e2fda8b3ff55e366307e94703c532c0031f87f0585588177af15ad1425777d7e7fbe035414f11d94abec13eb
 EBUILD go-9999.ebuild 4798 BLAKE2B 50daca174e8bc89f747432e96bc7d66e6c7dd50320d0b4c97754bb90267d62b700d34c250a892fdf60c907fa5eb881dd7adb3e64eba7ceb240740bd90c399f83 SHA512 051671c9a99efe554f9ed66423a20d053546ba68fdbf8a900e4ef0a365622bf8fcc976c678e393ade4a5475e01ccc53668d61d98e1b976e69de030662498273a
 MISC metadata.xml 590 BLAKE2B 56da63bdc350df5c6ef3b511a386627f4020f655027ca88da6a83ecb09581d3c3055c836eb8fe98a383412b3d431a77a9935ad753fe2d8392afa37cd613c15b0 SHA512 5d78adbae30c3a805194567bbb1af2ad59b78487819e7841a040d2a4d5db02f5b5d1d58f7cfc7a37f39e5e9bcf332dda4d336456e33e36c33caef792ac45d48b
diff --git a/dev-lang/go/go-1.19.9.ebuild b/dev-lang/go/go-1.19.9.ebuild
index 5fb93c0e9487..46cdf38c566d 100644
--- a/dev-lang/go/go-1.19.9.ebuild
+++ b/dev-lang/go/go-1.19.9.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/go/go-1.20.4.ebuild b/dev-lang/go/go-1.20.4.ebuild
index 5fb93c0e9487..46cdf38c566d 100644
--- a/dev-lang/go/go-1.20.4.ebuild
+++ b/dev-lang/go/go-1.20.4.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/orc/Manifest b/dev-lang/orc/Manifest
index a49f54187ee5..a14ea1671a66 100644
--- a/dev-lang/orc/Manifest
+++ b/dev-lang/orc/Manifest
@@ -1,7 +1,9 @@
 DIST orc-0.4.31.tar.xz 177768 BLAKE2B f06fd6be70063ebc82b45c1801a53aab66b5fc8a85c33991602488ec8ed29f2271df20c3780655953cabe33e865530b1218aafa0592261bcc5dccc4a4b3945e7 SHA512 4e97597e70982dbfc239d1ef9a8913b0155e5aaac15d91162d7f73a1095bd944e27fbe6d6194b9f74af07b985a44b1d9dddbe917425e1ad9e8da17ce86495696
 DIST orc-0.4.32.tar.xz 180340 BLAKE2B fca41f0fc46bb6a841eb37f0f403afd0850053f93d34d50ba61c2e50c5029be7cb4fa0ba03828d87275aae1b4be2d968c32318d5d895ca7adf0f5edaf1f89efd SHA512 63e2ab05bc23e07cd5c1ed3192515ec3b1f666abb4f9ea5de4bd72461f3a5d7066860e2ad38f35d0acd81fadfa06f2a18d61838eae89c74dec6a78099a343567
 DIST orc-0.4.33.tar.xz 199024 BLAKE2B 45518ff948f794c5a0eb14ddd462b58760d178267da34fd449a20d1bef4f7d6378b499efe1c7782e83c55be060b6f67023074cf8134e6a5ce129921324562c9b SHA512 ae8adce5dd62f4054879e6f2db76ce8a7959fd32fef0fb99f73f450ff58c5237e15bca764f6780309a163e40afcf400345f12b0aed5b88dc698064e44f8eede0
+DIST orc-0.4.34.tar.xz 202628 BLAKE2B b741e9bd5c0f0f3e56fad2f8a9bc10ce4a503a936eb2d64c4acf8ea5a69aaefc54edbd037846343181fb4f5f54bcd4409e5d4ee993ae09d266bdf37bcb86114a SHA512 ea6ce72398fad7569b97afe8e635402a7cc6d5e27b57c27fd76d85ccdf971391b52187297e5849e50ce1031691e9748f2cc312cb39bd0c6ac23c00ac6d96cb41
 EBUILD orc-0.4.31.ebuild 1138 BLAKE2B abc218e2e70e8b205dd845fa33d6a038c67b187ae29ee0532c5e3e143ff623c0e4ab4c78b707fc8fcb6c003e64524e7505bbb5f00a297fc2d41ee458ea7ca168 SHA512 ea14418fa88a9bd3bd290823cb7c8e21e535d60800d90bd729b5b2f18a9f19ee6f535beaefecfed54a96f8ee33732812816d10813c54773192237ad40f923a00
 EBUILD orc-0.4.32.ebuild 1139 BLAKE2B 48c455b5b34e6f82da340e0afbc319e36b6ad57b9b6c76f2943a5e878c4049e7451b68801c1fdf857b19ea96380ad69c81ea54241496bf46de9bf50eba24866a SHA512 211cec9f9c4c9b31d6c7122220c26fd300d9fc215e4fe366356bfce04fbd6896665bc232d0f02f006c217ed9e498739b191e86e5d4f6cb66f488bbf183afdf9b
 EBUILD orc-0.4.33.ebuild 1138 BLAKE2B f556e7b863e269abd5983b9471225a3d5832968b0d862bde69b34fe81eb113f636214e09a4dc00b0fa6513a106ba796e4dd2b3a90e51e0611d7ed0607de67790 SHA512 d7e965a474e2ebce37599a52e70324f99e3ea9d77413551a4a3cc972eda97e4532b9f65f88b5268e0e8333593a82bd670a07a192ad7a55c892ebd0aac8113a92
+EBUILD orc-0.4.34.ebuild 1072 BLAKE2B c90a8514a22feb3000b3d59bf72870efb0d1cb4f79489a084e6df5199d3bb553423e86257bd624af11fbd7c0dc70bbe3a0f54022ee54a7691309735eaf52f925 SHA512 76d0ba8fdc646c9f3ca7cc5079ca93ebfc4df1645210f8800b9038dbe5887998237d0cfd2867650bcec7a68531fb4a4b5df0907d654894575a9ec81743b826fb
 MISC metadata.xml 265 BLAKE2B 15de31a2337fe8b9175ffe3fd29cb1eb24148d7463f772b18a7fe8b38bd4edb05005df1ce6996cf23dad21db879c18b95d245fa9d096a002b95155c01088f516 SHA512 78a0c7a2a820f7032f384cf68d2affdd92d6f1466778f879909d0acfcc1cdc3bd64eee700ba06979f561583981033aae59b5d61eb4cfd01fc71fc13e4433305f
diff --git a/dev-lang/orc/orc-0.4.34.ebuild b/dev-lang/orc/orc-0.4.34.ebuild
new file mode 100644
index 000000000000..f3ef85f1507b
--- /dev/null
+++ b/dev-lang/orc/orc-0.4.34.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="BSD BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+RESTRICT="!test? ( test )"
+IUSE="gtk-doc static-libs test"
+
+BDEPEND="
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.3
+	)
+"
+
+multilib_src_configure() {
+	# FIXME: handle backends per arch? What about cross-compiling for the other arches?
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dorc-backend=all
+		-Dorc-test=enabled
+		-Dbenchmarks=disabled
+		-Dexamples=disabled
+		$(meson_native_use_feature gtk-doc gtk_doc)
+		$(meson_feature test tests)
+		-Dtools=enabled # requires orc-test
+	)
+	meson_src_configure
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 90bb10dd9b62..94d6fc19b0f6 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/a2wsgi/Manifest b/dev-python/a2wsgi/Manifest
index e5776a222734..fa4508aa1512 100644
--- a/dev-python/a2wsgi/Manifest
+++ b/dev-python/a2wsgi/Manifest
@@ -1,3 +1,3 @@
 DIST a2wsgi-1.7.0.tar.gz 12933 BLAKE2B 20dc3eb0a836e47cab98810fbaa343a0ac2070a0aba3e80667e32a14a72c8838acd2c3f082d4ca2ef639b37086523c2ce18020f5ec3acfa08d0b593e9cf5d196 SHA512 f2971bfebceec7a0b91fcc3d5916455917a4f05e39f61cfde8027b1e7051c21e5ba389b86b223fb9fd875471994eee3f4455c6634b5b207417d3ec13c9452f4c
-EBUILD a2wsgi-1.7.0.ebuild 696 BLAKE2B f68f5f6d604f929f37294c23102339db9d138506e852f9ae26861df4533f2713ecce5ab1b4e67a65ed91ed1eb3349d6cbbac7251ad06ae55324b55d4aa2aab7f SHA512 eb68926c192c1f14793cc081688a207f6b2d8ddb198e8fc82047e62883df219324aaaeade9c87c619919ce650c486808496d9ea38a4eea7d948d67b6476182ba
+EBUILD a2wsgi-1.7.0.ebuild 697 BLAKE2B 95087104139020c24e9d0779bb11d028da98b28054b40dfa405935652e7a86994f5a7529f39500f51b5ff577cdbda057088ce3ff0980a67c822d068acb922ba5 SHA512 3f802efbb08172a36cf4c6cb92bb7c974dbd57067b0790c4fe27e51404d18c9868ac334a303248a903ca1e302a706374147e92ddadffd72b750a678f8e71d7b0
 MISC metadata.xml 392 BLAKE2B 17f9cfa46eeac0752f6e27d004a04173528f5033dee30ba31bb9b0d86231b3311937e0765cba3cae0fcc8b9653654c9b53bbc009f15140db0b38496856b9c27e SHA512 828436206a1e9b01df9da1546ffc8e6bc614e71708ad8a806dda9ab2dad80c86e539c37496a0c2525f0370e9ead3131bbde69f235da83331cd5097985981006e
diff --git a/dev-python/a2wsgi/a2wsgi-1.7.0.ebuild b/dev-python/a2wsgi/a2wsgi-1.7.0.ebuild
index a30afb3396ed..240ad14e3e0c 100644
--- a/dev-python/a2wsgi/a2wsgi-1.7.0.ebuild
+++ b/dev-python/a2wsgi/a2wsgi-1.7.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=pdm
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index 69c5a70aa064..db7fb7a5633b 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,3 +1,3 @@
 DIST hatch-hatchling-v1.17.0.gh.tar.gz 383013 BLAKE2B 469d0d3e017d2dadcfdf9e2b4975f9e484739737a5c2d8fca9c55a4e519cf2e12b1ee44b3e26160476b3b990b15219a7075e692b58dcc4104b76b57395d8b0d1 SHA512 3649f2932c9963184deda5aac91726dad30ed88db2230377dc303714e0cdfd148b2fefc174ddeffff5cd95033bd984a35e3d297da02c29e4bfb7a6fb42f12dbd
-EBUILD hatchling-1.17.0.ebuild 2500 BLAKE2B 31a841bcd132570078bc24ab36b2fe6dcb06e398ff1cb2c872fef6d507d77f811275ac85205943420b814a9060a1ad88d7ad83407f67bd77944a5f1571b2b035 SHA512 be21833255fb47cd29b9278168f09091005143a570bf1b49876f623abf28f2a97069b458490e064b40438d1b2e3b23184d01ece1b8918ca69debefb51a4a5796
+EBUILD hatchling-1.17.0.ebuild 2489 BLAKE2B c76ead3c546eaf1d822617ff5eb49e03b9a50337b43c791a7e6cd2c9c583e4d8913556933fe06c8311c1199f7ce8153fcef2b041a4d77dbd39139c6027a88f2a SHA512 9c56601089415491831489b087edab4dbc56410b9f1753d9859c1736f99c1990aa3de5c03c2499f9b986b5bac5737ff6a8a4d4a1e103e43bc1823f23dec05573
 MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e
diff --git a/dev-python/hatchling/hatchling-1.17.0.ebuild b/dev-python/hatchling/hatchling-1.17.0.ebuild
index cd8af0a567f0..7ec5ce6883bb 100644
--- a/dev-python/hatchling/hatchling-1.17.0.ebuild
+++ b/dev-python/hatchling/hatchling-1.17.0.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( pypy3 python3_{10..11} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 )
+PYTHON_TESTED=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
 
 inherit distutils-r1
 
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index b9219c411e6e..a16ecfac8e9b 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -3,5 +3,5 @@ DIST httpx-0.24.0.gh.tar.gz 2167376 BLAKE2B 261298dcb65b22c4b188b03a7f650ed2527c
 DIST httpx-0.24.1.gh.tar.gz 2168238 BLAKE2B 97a23e14635e8863b8f6fe80691ac4ae1706e0ce426d7cf9efa26ab54bb026d4a230a072bc16ec2f7edc08c768107ee00443626be1734d566bca8a190daa5ed0 SHA512 056741ef4e356f13adfcb66766489b39e79dbf4264d9780b8788c0934f7f3ff1a9b6bcb396a9f146e88315831f5399cebdd537c5a39c86b9b6bac3600d5560b6
 EBUILD httpx-0.23.3-r1.ebuild 2065 BLAKE2B e72bd8f840db20e9b1a81cb553f1944f0f61833bda85d00c1991e783374a8c9834e8777e461cf9d25dd82f613611ab220fc37c79536f2899e55449f9e0d0d8cb SHA512 7e9feb79312692bccd4ac41da00d00f301b345a259a1ab740c614813042d0ad1639e7f3269dfcc6d3d1467793c0ac4b1f454fd1f54fc0a08a7fce3292a2b1e35
 EBUILD httpx-0.24.0.ebuild 2027 BLAKE2B 33ed5ce8442e134cff8b575b22cd8ff79bc8fe2695bd6006b9dc60a49933d693239e49c407ae53468e2391a71ab778098a4f6a1e51aaf1e4fa657a0be5c6aeee SHA512 122c008fd9007451bbcbc53026011d65a5ae00a58458c230b7f3b56bafe09885588e04bd3f2690f7d60000d8fcc3cf0f69f8aefb2f0bde6769eaa079a335f367
-EBUILD httpx-0.24.1.ebuild 2036 BLAKE2B eb844a9ac39be1053241d19278e08dcd068f39841343dbdf87ce792ce6ca1bf81f4451ad849e142ea6e9fa1a4c9e47eff1034770057650d32a05360c9c5ab13e SHA512 cd6eecaeeacf1f8089d0d3f4583a896c0e6ad3708b97cc3df02f71c8d1776cff949fa397fdcd1af47ba7b7cea36d910ec5758b4e8e5d23152faea7a03698a8cf
+EBUILD httpx-0.24.1.ebuild 2079 BLAKE2B 7727ac7585ab98a542ad7ba28ea0dcd97ea1c2a9edb5e8fb7a18d821067300ba0716f9eb426ab99c755a788f2ac0b04d8c69c853334c63712c73943e7dc4b5b3 SHA512 dd4ce9340fe556fa49728897b42ac06d33ac02fa770fa01d853b872a79ae91f3f93c0f373b128adfcbc64eef52ceeabc8b02772a41a9d2014b128f73f63eb974
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/httpx-0.24.1.ebuild b/dev-python/httpx/httpx-0.24.1.ebuild
index 0912c3ade94e..b741b719c85c 100644
--- a/dev-python/httpx/httpx-0.24.1.ebuild
+++ b/dev-python/httpx/httpx-0.24.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..11} )
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
 
 inherit distutils-r1 optfeature
 
@@ -39,6 +39,7 @@ RDEPEND="
 BDEPEND="
 	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
 	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
 		dev-python/anyio[${PYTHON_USEDEP}]
 		dev-python/brotlicffi[${PYTHON_USEDEP}]
 		dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 61bfbd81180e..a8d6083a4652 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-httpx-0.22.0.gh.tar.gz 24409 BLAKE2B 9db6622e4997ddf0a70c1a0ef835b077640b3ce1d1c19792feda573577fac1ecfba16bcb7ecb8e4c1578b345764d8301aa121335a259dc91a4805173a549bea3 SHA512 fd89ce70113608195eb8fa8e3d7465d9d15b5a300e7c00f3c50417ba9b205081671fbda9591bdb16accb1973da00f5d0bede9e73a3351b0652080d4059c5f6d6
-EBUILD pytest-httpx-0.22.0.ebuild 857 BLAKE2B 139b8916e6031c08f471f6e2775dad3967bb3a3bcbe5b73cfd6bbb90bee0477c736513d69815043d983d0d2f501580e929bcf604b0f748193fe42f03e35eca4c SHA512 b914613b0ac6e23998767d6fbeb2271a95978323817fc6335150db0a054448231dbfe178c6a996330d7404ded2a75d2453433abfcedded43fa2de805526fb9ac
+EBUILD pytest-httpx-0.22.0.ebuild 858 BLAKE2B dd4e47959aab0f7ee9f87e0636bcffde2bd04e0a4d4524f9c4791519b32bc1d9fef0a8e80c7d128c3a26ad8f957526573a73199569e1cdb9f0eec2004ff6db65 SHA512 ad0ebbc2e8f8597da2976c75179763928e48419715384d1aab893e766776674057d4ecd27d0a1f6aed1b9b6333e42a01f147725687e326babcdbb994099ad065
 MISC metadata.xml 468 BLAKE2B e0f824f05936a831a958b027366ba18cad85307ac6c81b74b299f58270bcff53e06f32b2471d6433bd7014ffde83ddb24f787c07632453d14f4ee6e4679ffd10 SHA512 16bf024801db3c0d7b789cd1f16520a1ff2520e8b3e2abbeeff5b1192c19b8ac64f55fa678c922f8a817debcfe05242ce11e0164a00422445d7301858718b359
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.22.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.22.0.ebuild
index 22d0ccc852c8..c72159d738ba 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.22.0.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.22.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index baf0d743cf3e..68a89107add9 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -9,5 +9,5 @@ EBUILD uvicorn-0.20.0.ebuild 1891 BLAKE2B 1b2b60d41b47f64023e304adea33540f1edb3f
 EBUILD uvicorn-0.21.0.ebuild 1897 BLAKE2B f3fd7b2f58004b54644f50023c61c1a2baa3f6014e99ebdc6791a91df76bf378b364782422e205055d1e781cb206750792445aaa5113adc754224a1e8a562bf4 SHA512 a1e17fcce3ccc3fcb7bc3395b88065865f05a8b6d9e3f3b5fc1d88e8953c1d9fc0c7b512e6554e0fef4ceecb118c48654a99681e1461cb879d199e567895594f
 EBUILD uvicorn-0.21.1-r1.ebuild 2356 BLAKE2B 2ac2a502023a53001bbf373bc0d1573a2c09d36ca9b95d825bc02948754b187263b87a13f81a6d2604fee3a20be28f140112a7dc20570fad4dc761389dd1ea87 SHA512 0289d0b6eedab177f2dca77127b4e0426a7f3be904cb46863e52f74815befc6331cf2dc4fe9a42552de7a91ec6ad97823743d5f1e29314caf9a68dc119a2e42d
 EBUILD uvicorn-0.21.1.ebuild 2027 BLAKE2B 7a21242c15558393d27872700ce0c5d6e26f0e1a0f8536494e62a3a119c0cb448e8b00f084ca8d8a49292b10a2455a5c662fad59b3bc54bb49ca1f9b33a366a3 SHA512 2428b94bbda2020865420f1898b2b44b4fda3556cfa9879be3df1cf0b3ba19049db69678a20e1af4027eb7293af456d00c941a4270da7c51c671bf828936d3e0
-EBUILD uvicorn-0.22.0.ebuild 2046 BLAKE2B bf9e01497cbdf77e4ce60fa6a6583ed4b16d0a7d36cb89692856a57372f3bdeae2c74d5e32e34c77f4f6c413c0fe8c2b7cbedd7f1df2ee8193331de7e22af55a SHA512 e223d272ae1bb3b2f005bddeedf6611665c543194a05ebbbcf0a59f1a879bb2bedb0a176534ab3bc7cfa99599e91c0a09adfbcc29cbd6a173129761d9be6c9ae
+EBUILD uvicorn-0.22.0.ebuild 2261 BLAKE2B edfe954c1eb1c83f4fa9a69beb300d1d5aebe5568e0d4fe9af4181928e4493128d0d5797d6c789ddd00e0a8a629a8d6b19f8678ff16275efe29ad53f3e4f65c3 SHA512 9f1efb8051eb3647012a36507ab72ecb5a066835f0e93194e1d2e3efba4bbe2183962a68255c89f8eaea67b03bf1f93c1264e00bfe972d7f08e51b08c641656f
 MISC metadata.xml 451 BLAKE2B af9be617c95128297e3455b503e198e13c373244094f6aa9c80837945c3f9f023f1874efa28d4ffa8b241feb9a4e8c7f3d3534e96966733bd5593bffb90904a5 SHA512 4d76bab5c20f7cad81fa56a28c9be07bf2c2ebc412fc647f073215d437a2550eca247b8419df71d04200d0fdf545520684db0b6f4953e73848f69a4f4ad6931e
diff --git a/dev-python/uvicorn/uvicorn-0.22.0.ebuild b/dev-python/uvicorn/uvicorn-0.22.0.ebuild
index a5836d8ffe40..2c2f842fe04d 100644
--- a/dev-python/uvicorn/uvicorn-0.22.0.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.22.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
 
 inherit distutils-r1 optfeature
 
@@ -67,6 +67,14 @@ python_test() {
 			tests/middleware/test_logging.py::test_running_log_using_fd
 		)
 	fi
+	if [[ ${EPYTHON} == python3.12 ]]; then
+		EPYTEST_DESELECT+=(
+			tests/supervisors/test_signal.py::test_sigint_abort_req
+			# hang
+			tests/protocols/test_websocket.py::test_send_close_on_server_shutdown
+		)
+	fi
+
 
 	epytest
 }
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 959a45b1368f..e060bedf8f94 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index db4b3fabb644..7cf00f2047a8 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -8,7 +8,10 @@ DIST gitlab-runner-15.11.1-deps.tar.xz 161358304 BLAKE2B a318aa741a29c3e1623a389
 DIST gitlab-runner-15.11.1.tar.bz2 1343959 BLAKE2B 3c1a12aedb6ec4ba88b20f1aca30e2cae3acbfab7aa22ab91cc87c355e1f1926f27c70a0357be6f969634bca200a7b9e69fb2bd09403be21d7fc4383c48d951f SHA512 5756952adf79a72ba62eef7e28d4dd134fd1aa00a020c615a11fcd6d8fadeb2ba40cf8e20d8bc253082885ea8fe77f18124da35fb7fa5f7bc7360b8143a85cd3
 DIST gitlab-runner-15.9.1-deps.tar.xz 159144912 BLAKE2B f10167c731371dbf4d61a05d9154a3127e286846fd60e2eb7291a587d707389fdb989526942263e7a7fac2af02fc343e316528ee2f64aaf97a048e83e58521f9 SHA512 ae74bbfa62ac4a7506ec6099fab11bcf66f7b270ccc0a17dde0b226cccdbaf51949bea44f437e97c20e4b60c605060b42e77a36a11fb5eb080d55dcf30ee58d5
 DIST gitlab-runner-15.9.1.tar.bz2 1267756 BLAKE2B 1732db4d7d8a3f530654f2897ec665bef87cefbfafc8776ba4b15d327768924d9fef5918a5d31899825e17bba20d04bfd30f6c8cbe834b266cadd0f414cfe840 SHA512 ab82cce1956105046aba8560317e00f3f333669ca7ee305879821bf433485599d2eb206afd8edc04c3b9c3d07eb38dfe335c77ff9a4f431bee5dea0a1d10b9c2
+DIST gitlab-runner-16.0.1-deps.tar.xz 161414860 BLAKE2B 10aeed685269102aae8a738b87c29fc553ddf3ca14309c7634180d9909d943a94727df851f0374dd0ae6c0b221a54bbd48a0fa38047cb50d1ca08798872c0ec0 SHA512 9337002f9a3c1356db11d635d767826aae719ccf546da77a3aec4c9d6eba253398a237f517d0a48aef60021d8d9a303656ac3bda4c5a282dc219034c8e704e88
+DIST gitlab-runner-16.0.1.tar.bz2 1345390 BLAKE2B 2c2bce5444721786014b0830149a7c430f5bc76b1f90df1b1b988788b4b43a79494419758f64ac56ca582ce9ffb214bfc9426bf8d9d2f1c51e09bb26a213406f SHA512 aa45659f958361d8fa138cf496faa68b278084127a225cf56930bd040db2b20307bcfe98c230ecc6d6f7576fbebebb6aa5801a4d17de2a977c92fa2ddf28ee84
 EBUILD gitlab-runner-15.10.1.ebuild 1679 BLAKE2B 155e02174b6ee06840770cb1561766b652132c9b0d88798d0e180dd8f2a5ff55c757be108febcca65f8eee0004ff5e236a7101a6a86d06904b54cad038729884 SHA512 ff1240350cddb671535e43d619a4bd6589ed51cb3244ead7c8b6169642f0fe990851c9266749462df416ddf7c74a1e1c9f9cda6dec0683dcba41b97312b727b9
 EBUILD gitlab-runner-15.11.1.ebuild 1679 BLAKE2B cf8f346d67d02d5b218657cec906f39cd8e5c8c446aa443c06bbbc33905df637332f48a4ea3ad908a35a90bc69255dcb887169d4e5a716d22cf644022f71ea7c SHA512 c75e0213226b66a2c2b8cc3957b45c175fca11301327a7cad9ba4489a7a4b66bb10f6c49cc46d8e0680aeebd121660be5f8cb9157734a810a07679e5118534f2
 EBUILD gitlab-runner-15.9.1.ebuild 1679 BLAKE2B b225f3d51ff0f48c228244647ccc1ec58b6184732b624a25929ad55607840407994828c9a372f4407d1053e8817dbe7df9e7803d522c28b113985efa3b2116ba SHA512 7e17c1d37046d20b49bf2c40d8bd70a8183e7e0f9099dc9e4f8d9ff53aeeb32fed7e84bdf834db91fcd5030689a77643973db966e125d9b7468d43bc84d4289b
+EBUILD gitlab-runner-16.0.1.ebuild 1679 BLAKE2B c322de6de3ad9bd6e2f3a9c91cd9db2359acd073c78391d7521b2a786d986d7c07676555bbe47eccc8251ddf0a56ced99aba11d6d3fe1530770390292c568902 SHA512 7f8338dee3cce31879b7f0fe4f8cd570eba249b209db43338b15a8f61c991a6f784eadb7a244c361e61c788d38e9877eb4a90b242cb84303aa6ecf3865924d7c
 MISC metadata.xml 338 BLAKE2B dfdcaaee18d3e5492674d3b4055002201342fa4d5b713f88240753002de2bde6244469fe42fe514cb82544d15deacd235cd031dcf71d661a24b26f422c67c392 SHA512 b12a8270df4f07c6b4359150a3b7341d3913a93598153824ec758384758e69667a89de20066735ccc24aea7af07b5c1bdd444fca3193be5402bce5154f90ec79
diff --git a/dev-util/gitlab-runner/gitlab-runner-16.0.1.ebuild b/dev-util/gitlab-runner/gitlab-runner-16.0.1.ebuild
new file mode 100644
index 000000000000..68b04dc38d08
--- /dev/null
+++ b/dev-util/gitlab-runner/gitlab-runner-16.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+
+# make sure this gets updated for every bump
+GIT_COMMIT=79704081
+
+DESCRIPTION="The official GitLab Runner, written in Go"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
+SRC_URI="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 ~riscv"
+
+COMMON_DEPEND="acct-group/gitlab-runner
+	acct-user/gitlab-runner"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-go/gox"
+
+DOCS=( docs CHANGELOG.md README.md config.toml.example )
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_compile() {
+	emake \
+		BUILT="$(date -u '+%Y-%m-%dT%H:%M:%S%:z')" \
+		GOX="${EPREFIX}/usr/bin/gox" \
+		REVISION=${GIT_COMMIT} \
+		VERSION=${PV} \
+		runner-bin-host
+}
+
+src_test() {
+	CI=0 ego test
+}
+
+src_install() {
+	dobin out/binaries/gitlab-runner
+	einstalldocs
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	keepdir /{etc,var/log}/${PN}
+	fperms 0700 /{etc,var/log}/gitlab-runner
+	fowners gitlab-runner:gitlab-runner /{etc,var/log}/${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process gitlab-runner.conf
+	[[ -f ${EROOT}/etc/gitlab-runner/config.toml ]] && return
+	elog
+	elog "To use the runner, you need to register it with this command:"
+	elog "# gitlab-runner register"
+	elog "This will also create the configuration file in /etc/gitlab-runner/config.toml"
+}
diff --git a/dev-util/sysdig-kmod/Manifest b/dev-util/sysdig-kmod/Manifest
index c11664a2c347..4f19df9e28fc 100644
--- a/dev-util/sysdig-kmod/Manifest
+++ b/dev-util/sysdig-kmod/Manifest
@@ -1,4 +1,4 @@
 AUX 0.27.1-fix-kmod-build-on-5.18+.patch 2363 BLAKE2B ecd23377a65d2093c7d97158abe3417da2a45d7e10d692731ec3aa4cd1721e1294c516c61668aa30b6d290963a7126bd0a3f1df3da9e6b54d6ab4978bd14aac8 SHA512 a92592ce54b53be679ce094b578ce7c55366a8e3ef5680b83eb09b86b7fbcd3187f302e98424deb4fdcc37c5898167a8309f98e6ec3dd81b0aa47774409d3121
 DIST sysdig-0.27.1.tar.gz 936415 BLAKE2B f4c15e3a2d4b974c5eafc8374f927dd82f123c05cc1976d04b08e77e1a7c0ff53f37c4e2c0022b7073fcc936310daf76ca3c3611141799ae4f51991bc6f3a0a3 SHA512 690f012c7db0a75ec2eb78fae17aae0f422aa1db0d4c2b15c4a09153fd2f60bd3c00d62238976fdcff2a906d87b2e34b81d02c0c78ad2684a1d6016a9988eb08
-EBUILD sysdig-kmod-0.27.1.ebuild 1008 BLAKE2B 9e9ecf6e83a5de4690f2dc3dee217fcd05ec51f4d42ab7a674bfe428f8690adacb42c6f5de7ce5b7261bd2a8d6f1cc9f4e3852cd2077d60b901d032ff0392327 SHA512 680989517e9f3e409ab6084af0c1559a771b900976c918aeedff71b014f578fe88ad7bed4db1b33c9474baf33ceef392c8706ee73de7799f201ed0ce6c2b1a52
+EBUILD sysdig-kmod-0.27.1-r1.ebuild 819 BLAKE2B 024cf63364ab61a8376a415c4794407fdca0cee8c34b45cb5de318b089ef4e5ba29d2b265e950f830b4adf0e739f839289196783ebecd248a2e8b166da411bf7 SHA512 daa895f04e2644b2a8b138f00fc4e92b95a5b0a8487f07abbf84781a27b262e22ef7891ed74827176d5faaa8980adbf48a4f0cac1f5d2bb3df42fafc478d2f0b
 MISC metadata.xml 246 BLAKE2B 35cfb0369ed2d389a18f9df8c6ffa8d61a2ffd51a358d720686706b6e694696fd1c46eab08be11e3733bf11edccb3734869b12612829858131072cae4fa98095 SHA512 113c52a3246e912aa3d5369eef4952e480d8f5a45b6656676fae8b10d3125d7a55430c87680b9f985f11fa58b3f29c1d13b3fdf94896c2f61c0451d0ca6a44a9
diff --git a/dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild
new file mode 100644
index 000000000000..b08faed2f3e3
--- /dev/null
+++ b/dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake linux-mod-r1
+
+MY_P=${P/-kmod}
+DESCRIPTION="Kernel module for dev-util/sysdig"
+HOMEPAGE="https://sysdig.com/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( MIT GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch
+)
+
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# cmake is only used to generate the Makefile for modules
+	sed -i '/USE_BUNDLED_DEPS/,$d' CMakeLists.txt || die
+}
+
+src_compile() {
+	local modlist=( sysdig-probe=:"${BUILD_DIR}"/driver/src )
+	local modargs=( KERNELDIR="${KV_OUT_DIR}" )
+
+	linux-mod-r1_src_compile
+}
diff --git a/dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild
deleted file mode 100644
index b679552f204c..000000000000
--- a/dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-mod
-
-MY_P=${P/-kmod}
-DESCRIPTION="Kernel module for dev-util/sysdig"
-HOMEPAGE="https://sysdig.com/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( MIT GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="!<=dev-util/sysdig-0.26.4[modules]"
-
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-PATCHES=( "${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch )
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e '/USE_BUNDLED_DEPS/,$d' CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-	)
-
-	cmake_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver/src:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index c8ec595e6f2f..1e39db9f6d78 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/linux-mod-r1.eclass b/eclass/linux-mod-r1.eclass
index d665c42f9dd8..30395c1496f5 100644
--- a/eclass/linux-mod-r1.eclass
+++ b/eclass/linux-mod-r1.eclass
@@ -544,6 +544,7 @@ modules_post_process() {
 	(( ${#mods[@]} )) ||
 		die "${FUNCNAME[0]} was called with no installed modules under ${path}"
 
+	_modules_process_depmod.d "${mods[@]#"${path}/"}"
 	_modules_process_strip "${mods[@]}"
 	_modules_process_sign "${mods[@]}"
 	_modules_sanity_modversion "${mods[@]}" # after strip/sign in case broke it
@@ -850,6 +851,27 @@ _modules_process_compress() {
 	fi
 }
 
+# @FUNCTION: _modules_process_depmod.d
+# @USAGE: <relative-module-path>...
+# @INTERNAL
+# @DESCRIPTION:
+# Generate a depmod.d file to ensure priority if duplicate modules
+# exist, such as stale modules in different directories, or to
+# override the kernel's own modules.
+_modules_process_depmod.d() {
+	(
+		[[ ${SLOT%/*} == 0 ]] && slot= || slot=-${SLOT%/*}
+		insinto /lib/depmod.d
+		newins - ${PN}${slot}.conf < <(
+			echo "# Automatically generated by linux-mod-r1.eclass for ${CATEGORY}/${PN}"
+			for mod; do
+				[[ ${mod} =~ ^(.+)/(.+).ko$ ]] &&
+					echo "override ${BASH_REMATCH[2]} ${KV_FULL} ${BASH_REMATCH[1]}"
+			done
+		)
+	)
+}
+
 # @FUNCTION: _modules_process_sign
 # @USAGE: <module>...
 # @INTERNAL
@@ -1197,8 +1219,19 @@ _modules_update_depmod() {
 
 	einfo "Updating module dependencies for kernel ${KV_FULL} ..."
 	if [[ -f ${map} ]]; then
-		nonfatal edob depmod -ae -F "${map}" -b "${EROOT:-/}" "${KV_FULL}" &&
-			return 0
+		local depmodargs=( -ae -F "${map}" "${KV_FULL}" )
+
+		# for nicer postinst display, keep command shorter if EROOT is unset
+		[[ ${EROOT} ]] &&
+			depmodargs+=(
+				-b "${EROOT}"
+
+				# EROOT from -b is not used when looking for configuration
+				# directories, so pass the whole list from kmod's tools/depmod.c
+				--config="${EROOT}"/{etc,run,usr/local/lib,lib}/depmod.d
+			)
+
+		nonfatal edob depmod "${depmodargs[@]}" && return 0
 	else
 		eerror
 		eerror "System.map for kernel ${KV_FULL} was not found, may be due to the"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index c67acc44af3e..d90b973414fa 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index fe7f05becb01..984486ce45e9 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -9,5 +9,5 @@ EBUILD gimp-2.10.32-r4.ebuild 5792 BLAKE2B d540c13b099e3d07089ae3ec68dba083bdcf5
 EBUILD gimp-2.10.34-r1.ebuild 5691 BLAKE2B b5f65b44c7b62c855685c89b877633b779895ca84a916297fc5c973f70b2780b12fb09e6803065ba99133e2e2847232d38242dd64aa7b17330d646fd27e4767b SHA512 f82900051f8f8b172ec2b158c4f2e651a860ca98584f799479e82d219121db4a6d3527f0f25179734694052bea0fc5b5035e5a75780924d46fa86a2d4f2104a8
 EBUILD gimp-2.10.34-r2.ebuild 5860 BLAKE2B 3a4c858f8badd5eeb3e59695a886ceedc2fdba32303bdffbe4ebf0542497164c48512bb364cce99bdfb1c44241b4de8ecda709c561eb2ce0334ad871e3b39e4c SHA512 5e764b6314c395bc2b1b7f1fa8813a246a808775353627c3b7a2f43acb23155a5e7031291320ccc4752ed1fd183d53f7ba0e91ea89edda5a2fd7c3061b03e278
 EBUILD gimp-2.99.14-r3.ebuild 6903 BLAKE2B 65927150020c6e864f056dc840007672f0683966411aa2e339c1554b9800a823918d976f1fc0635cbfac2935fb18412721aa7c0e57922a6f72fbf503ebd01803 SHA512 f91bbdcf2b140651edfe7212a56bc6bd10ada839eb29d7261a22c1400cdeefc6413c48a4965b82624618d26ff9decccdcd871626ae4a3a3ae851b8421cf69165
-EBUILD gimp-9999.ebuild 6836 BLAKE2B bfd204c31255d9a6a385ac15286bcc3dd7be951d7a1806815073d971b968e9773f2c97e051f0dac9646b867c473350d3dc0a832f9a2f331a8344451889d3995a SHA512 9dbdb4da8efd64da96a6e91459e74dccb557a15ff8161252357d66e71eca47f8a1fb10e705b610f66c9ee7fc00bb1317d6eb0ec8582d5c625709b607a02518b7
+EBUILD gimp-9999.ebuild 6839 BLAKE2B 82a68c4f5bcdf876bba02a7fcb2400dc56030bd0d236cce4b7151e722c446a1e95272b7ae71ffab0593252fe2d6d88b067bb99014818a4392b7ff49d4b08912c SHA512 d1a981c09b9594743be7e57a8d0ffc6089c52c03d12355e6994c8db70a0b014237b71e617574435eb5b3e2891f34c911603d065ae4c7e564443132bb1c07acf8
 MISC metadata.xml 648 BLAKE2B 3454806e0bb680d45e98fd571cc5ad2e09d1083a84b44efb49ea527432be8a255ae02c1c53ff6bf47ce9e9e1a471d422212fd4c08d4983476c2585fa9b96e541 SHA512 dc39d7aa41dc6ae6ab850eec0ce9e10b0085aa8f4b4d762305f7ab70b7a1f7bbe454c21f3d87e796c29c41a4b99f7b3ca38a54261188e7b8acbf8bd3d79dfcd0
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 6ebeb03acdcb..04fbc6f67f0d 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -157,7 +157,7 @@ src_configure() {
 	use vala && vala_setup
 
 	local emesonargs=(
-		-Denable-default-bin=true
+		-Denable-default-bin=enabled
 
 		-Dcheck-update=no
 		-Denable-multiproc=true
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 2911637c4cb6..97501d37853b 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-libmms/Manifest b/media-plugins/gst-plugins-libmms/Manifest
index c257fc17738a..a3eb57fe3cb4 100644
--- a/media-plugins/gst-plugins-libmms/Manifest
+++ b/media-plugins/gst-plugins-libmms/Manifest
@@ -1,7 +1,5 @@
 DIST gst-plugins-bad-1.18.6.tar.xz 5652788 BLAKE2B d877c8b6d39b67de957f180fbcc942fc658631dfc75b90f342f088e58c4655b1591651fbcd2a98259c95f0a7e830bb0ec67f65eb87d4b13c9f2adc733da7f12f SHA512 78731e0db04afd3dcdd5c5ea84df4e096a5db121fd9cb6eb79197844482a3b36b2764a664f171f80c809e6182ceae2350113d47f3f7c684d2d88f752bc092baf
 DIST gst-plugins-bad-1.20.6.tar.xz 6244344 BLAKE2B 50c8d62b486541c0ee71d69f1debb18c7dcd02afe562f6d337f8648cf69a492ac47dcf250e4e6b1c6a7d518237431639c25601f9935996724cb9f73beffa27e8 SHA512 c1f2be9351dc12d9290f715ac529dc03572617fb65c50755927e01cb9307b9e806b6204b5b2f85c29a8fc3d8ca7695767a316fb387eac465e9e93bcae5d39ff5
-DIST gst-plugins-bad-1.22.3.tar.xz 5523924 BLAKE2B 8015098ac2d19546de58cebdbe29fd7fbb2c7f076bf775564d7b862ed99a59968a2f751ff1137534d178fea5cf1c2022e53e4159ca2e5d3bf71c9fa4663be4f5 SHA512 1512e26111174ea4a9da26203a635e7ec7673ea5b6ca8dae8aaa8a20ffae36c9b68904d669344a8efc31f751093a00e22d2a1f1affcdd037f162493441c77628
 EBUILD gst-plugins-libmms-1.18.6.ebuild 410 BLAKE2B dd4d00c912fd50463caeff6a4f154287a83bfa5cb850174dd70dfd9227652ec25822208515c3884a0b9ea4b404ae6245d3b1f8e7da788bc9ba5d9b15db19e132 SHA512 186a7ca2d4da01759d6f99359e85cf2ae1012bab9623346e40dfbac35c2b1be233f06084fa23664de180f9071887c1ffe4d51a616cd5c14457af3db3ef6ef5a4
 EBUILD gst-plugins-libmms-1.20.6.ebuild 414 BLAKE2B 28d39410193f1c6b9d08ef70bb6cce8ae5ba60aa27cc129e965360f093c2dd9479aa8abe852c9a2b93c2158fdff0a574a80253810fb1db7947270e88a3877edd SHA512 0fffd773b122da4adcd7cc082f1ee36cdb707d2b7e1b456af0dd5f920ee8689e2f0f6b57305df713f738e87ea1dfcf4d1505bbd151d017314e8e4de742363edc
-EBUILD gst-plugins-libmms-1.22.3.ebuild 414 BLAKE2B 28d39410193f1c6b9d08ef70bb6cce8ae5ba60aa27cc129e965360f093c2dd9479aa8abe852c9a2b93c2158fdff0a574a80253810fb1db7947270e88a3877edd SHA512 0fffd773b122da4adcd7cc082f1ee36cdb707d2b7e1b456af0dd5f920ee8689e2f0f6b57305df713f738e87ea1dfcf4d1505bbd151d017314e8e4de742363edc
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.22.3.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.22.3.ebuild
deleted file mode 100644
index 856f382daac1..000000000000
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.22.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GST_ORG_MODULE=gst-plugins-bad
-
-inherit gstreamer-meson
-
-DESCRIPTION="Microsoft Multi Media Server source plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index 59154dceabfc..aaa2c18c5c80 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -1,4 +1,5 @@
 AUX gst-plugins-bad-1.20.1-use-system-libs-opencv.patch 2383 BLAKE2B 351d9a5b8060fb2dd5fe94237f5bddb14a217d88af5c95db8badb71c7d816453850946f11cf6435d5fb8c2a318aa2b853b06cba78fc016d1ccf68fe6f23383b6 SHA512 36b2810e1e58feb490f249040eed1d10b1e8395551c427628e2a3b3de28b1a8ec523b7c3cde675423be34c31f7cb5e2e986bf36b252bd5e07385e6801b22177c
+AUX gst-plugins-bad-1.22.3-use-system-libs-opencv.patch 2624 BLAKE2B 3dc25233b48a290af78793e439c5220be1e8a8f47a06f61f723a33b1817e740e46a60ba699432a95430715bcb0ca6d4f69375276ff3bf3688c57966b110bf224 SHA512 d51c3cbfeed6b6021a2a132aa5a10fdfad597a50512bbb9f1ca7aaca58a294311cc2f386da2c3c15fdfac52408b8a1d582a33d82205edc61970d086fb69af406
 DIST gst-plugins-bad-1.20.3.tar.xz 6222824 BLAKE2B 01aae59adbe76b8e50a49fb8bb8037e6f3aa93cbc2b658aab05ebbf30f8d1aef98c1981712caa39e3c9d08f1e0c9d76f2f874f7d2fdd994b3a0735b2809eafdf SHA512 cfcf126eabff550455decd7054a269b73489708c10a6b6090dddb5fde29bfba07ed330c339927ff170e025fa3a08d2ffb822322dc3798679366207a54132c71b
 DIST gst-plugins-bad-1.20.4.tar.xz 6229992 BLAKE2B 2cd276cec9991e2ca7367a43024d7aee43adaa185a4a06ec08d1e736e72333f7f38cb54257120b9a313feb1fdc285a50d456b4c1fb33627d83acfcd3ece20687 SHA512 31b28d4a1bbecf021a90f2aa49dd344ccea12533b65f3bf3a8426ca2175469fff7b7f8e08af7d3d22c18db2fe48b9d5fbea2b325d296aee04b019cebef1eaec4
 DIST gst-plugins-bad-1.20.5.tar.xz 6237720 BLAKE2B bf379da420d1f7f148cf51373f6f2d0800685487c8bdb7a768e79e0a2e4f1721053922be9321958b4ce318de12ea390de4cd89c345329ac41dd0425815e0e7f6 SHA512 4b4603d755d17a0fa072d771521bdcbf554fc9abdc8105b9d9189062e5725ae2989f430e1de77363a69d8c969ecbf15e73e9c478fabe8efac83b2d9b1b0a4a0a
@@ -8,5 +9,5 @@ EBUILD gst-plugins-opencv-1.20.3.ebuild 720 BLAKE2B 9a678748ad38136b07b0d300def0
 EBUILD gst-plugins-opencv-1.20.4.ebuild 723 BLAKE2B eaa32051977543a70f4d043d23fd5cd10178e625f2e499bb897213a6f8de2d32335f068afc078661d17903577d150808b40af8d2f742dd2ba89d7e1276f548c9 SHA512 94fcd8f2dfb90c13ec7e4fbee6032ed268344e5aded5cc8597012d758bfb5a79200992241c5764a0544cf00743f176f2323c601e68de9a3f3399aead9c0fc26a
 EBUILD gst-plugins-opencv-1.20.5.ebuild 725 BLAKE2B 9876f5334e548e4a1e9c26559270d9a5ddc831d70a7e5c491bfa4e26ee5642ce29d5c50064d4a7cbb2d7bd8ad7d2fbf3bb221502e4849adca7a550de0d2212af SHA512 46341cf450595504fa56f230d768e882998373e00959a998efab3eec8c140ee12e27723690112b340367e2d45ccb470b49e8c01aa27e44734b72ec339f8a5d39
 EBUILD gst-plugins-opencv-1.20.6.ebuild 725 BLAKE2B 9876f5334e548e4a1e9c26559270d9a5ddc831d70a7e5c491bfa4e26ee5642ce29d5c50064d4a7cbb2d7bd8ad7d2fbf3bb221502e4849adca7a550de0d2212af SHA512 46341cf450595504fa56f230d768e882998373e00959a998efab3eec8c140ee12e27723690112b340367e2d45ccb470b49e8c01aa27e44734b72ec339f8a5d39
-EBUILD gst-plugins-opencv-1.22.3.ebuild 702 BLAKE2B d76d193b47119a3d079bc577c4cfa59e6df09c048b8b96a67556b979a5d81b8ca8beed38e1c397a87c5851fdb833e6c3f894c9575594cb8b02a149cf1a566b0e SHA512 ba1dc1f050ee1b0c3a5255ebf94f1c998a7e7c7174745034f3b52f9f3f1eddcb3aca9588076d4e555cdd333492dac0f910cb1079bd89b63cdee76f0c59854bb9
+EBUILD gst-plugins-opencv-1.22.3-r1.ebuild 696 BLAKE2B 3996404e3eb653f6cfefc148e3463a9e1a8f88bca78615e4b62dd633c4acb86aa827777fbede0935b76c031a94df0e495c92c63347626579ad5d3270d0f0ca5b SHA512 173907c0def07fd939710c63d5f23b6d7865c7e8235b137d4d0179d74b9e01834fcde21b97272d7c7299e7d59bc5d89d02c559f793ff3fb2f400a29f93385df9
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.22.3-use-system-libs-opencv.patch b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.22.3-use-system-libs-opencv.patch
new file mode 100644
index 000000000000..cb05c45c2c31
--- /dev/null
+++ b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.22.3-use-system-libs-opencv.patch
@@ -0,0 +1,99 @@
+libgstopencv.so is "normally" installed by gst-plugins-bad, but we want it to
+be part of our gst-plugins-opencv package (installing it as part of gst-plugins-bad
+would at least be confusing, and also not ideal given it'd have to depend on opencv,
+even though we have gst-plugins-opencv).
+
+bad currently doesn't have a way to allow disabling everything but the opencv
+plugin bit, so that's what this patch does as a hack. It only keeps the bare
+minimum to build the opencv helper (i.e. disable everything that gst-plugins-bad
+does to not collide, but keep opencv).
+
+TODO: replace this with something more maintainable, e.g. possible hacks
+with submodules or creating a drop-in meson.build in the ebuild to just build
+the plugin & helper libs.
+--- a/ext/meson.build
++++ b/ext/meson.build
+@@ -64,7 +64,6 @@ subdir('ttml')
+ subdir('voaacenc')
+ subdir('voamrwbenc')
+ subdir('vulkan')
+-subdir('wayland')
+ subdir('webrtc')
+ subdir('webrtcdsp')
+ subdir('webp')
+--- a/gst-libs/gst/meson.build
++++ b/gst-libs/gst/meson.build
+@@ -1,24 +1 @@
+-subdir('uridownloader')
+-
+-subdir('adaptivedemux')
+-subdir('audio')
+-subdir('basecamerabinsrc')
+-subdir('codecparsers')
+-subdir('codecs')
+-subdir('d3d11')
+-# cuda can depend on d3d11
+-subdir('cuda')
+-subdir('insertbin')
+-subdir('interfaces')
+-subdir('isoff')
+-subdir('mpegts')
+ subdir('opencv')
+-subdir('play')
+-subdir('player')
+-subdir('sctp')
+-subdir('transcoder')
+-subdir('va')
+-subdir('vulkan')
+-subdir('wayland')
+-subdir('webrtc')
+-subdir('winrt')
+--- a/meson.build
++++ b/meson.build
+@@ -530,23 +530,10 @@ pkgconfig_variables = ['exec_prefix=${prefix}',
+ 
+ pkgconfig_subdirs = ['gstreamer-1.0']
+ 
+-pkgconfig.generate(
+-  libraries : [gst_dep],
+-  variables : pkgconfig_variables,
+-  subdirs : pkgconfig_subdirs,
+-  name : 'gstreamer-plugins-bad-1.0',
+-  description : 'Streaming media framework, bad plugins libraries',
+-)
+-
+ gpl_allowed = get_option('gpl').allowed()
+ 
+ subdir('gst-libs')
+-subdir('gst')
+-subdir('sys')
+ subdir('ext')
+-subdir('tests')
+-subdir('data')
+-subdir('tools')
+ 
+ if have_orcc
+   update_orc_dist_files = find_program('scripts/update-orc-dist-files.py')
+--- a/sys/meson.build
++++ b/sys/meson.build
+@@ -18,7 +18,6 @@ subdir('msdk')
+ subdir('nvcodec')
+ subdir('opensles')
+ subdir('qsv')
+-subdir('shm')
+ subdir('tinyalsa')
+ subdir('uvch264')
+ subdir('v4l2codecs')
+diff --git a/ext/meson.build b/ext/meson.build
+index ebf7e3b..4124917 100644
+--- a/ext/meson.build
++++ b/ext/meson.build
+@@ -64,8 +64,6 @@ subdir('ttml')
+ subdir('voaacenc')
+ subdir('voamrwbenc')
+ subdir('vulkan')
+-subdir('webrtc')
+-subdir('webrtcdsp')
+ subdir('webp')
+ subdir('wildmidi')
+ subdir('wpe')
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild
index 1356163c0ab0..dd4e9c41a067 100644
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3.ebuild
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 GST_ORG_MODULE=gst-plugins-bad
-PYTHON_COMPAT=( python3_{8,9,10,11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit gstreamer-meson python-any-r1
 
 DESCRIPTION="OpenCV elements for GStreamer"
@@ -16,9 +16,9 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}"
 
-#PATCHES=(
-#	"${FILESDIR}"/gst-plugins-bad-1.20.1-use-system-libs-opencv.patch
-#)
+PATCHES=(
+	"${FILESDIR}"/gst-plugins-bad-1.22.3-use-system-libs-opencv.patch
+)
 
 src_prepare() {
 	default
diff --git a/media-plugins/gst-plugins-va/Manifest b/media-plugins/gst-plugins-va/Manifest
new file mode 100644
index 000000000000..944cf64f1e41
--- /dev/null
+++ b/media-plugins/gst-plugins-va/Manifest
@@ -0,0 +1,3 @@
+DIST gst-plugins-bad-1.22.3.tar.xz 5523924 BLAKE2B 8015098ac2d19546de58cebdbe29fd7fbb2c7f076bf775564d7b862ed99a59968a2f751ff1137534d178fea5cf1c2022e53e4159ca2e5d3bf71c9fa4663be4f5 SHA512 1512e26111174ea4a9da26203a635e7ec7673ea5b6ca8dae8aaa8a20ffae36c9b68904d669344a8efc31f751093a00e22d2a1f1affcdd037f162493441c77628
+EBUILD gst-plugins-va-1.22.3.ebuild 964 BLAKE2B e069ea6d2cfb4e76048aea3e9ce59b87ccdfa879a434e57816393f25d36f92510c01fac07b8d2aa44a659a387c4b885de10d5bef38c5bfbfcf496b1f91f992b1 SHA512 43c2c3dcc64594d55bb01849d98f9eef003982a74ddf79eb8ff170dc79103d65a89eb0b876f90358e054f1dcc2fe54c55113184e119bfb8b0242b697d52c820d
+MISC metadata.xml 267 BLAKE2B 331be70b2fa90cce1bf91ded1dac141de6a9bec40c1736bcb90d280ac7fabf22cfd0a701c7fd5864f007d1159954f7ee55701d5e68b47a1a9a217ca34b7ee619 SHA512 4dcdd6bc6d148a0e02a0f1b766bd0c5712d373d898c06078d8630e0067e858b815117392a11332b257156e95da6337494d99c2724d24cadb97432089908644b5
diff --git a/media-plugins/gst-plugins-va/gst-plugins-va-1.22.3.ebuild b/media-plugins/gst-plugins-va/gst-plugins-va-1.22.3.ebuild
new file mode 100644
index 000000000000..5793c7281a02
--- /dev/null
+++ b/media-plugins/gst-plugins-va/gst-plugins-va-1.22.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..11} )
+GST_ORG_MODULE=gst-plugins-bad
+GST_PLUGINS_ENABLED="va"
+inherit gstreamer-meson python-any-r1
+
+DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.0"
+KEYWORDS="~amd64"
+IUSE="+introspection +orc"
+
+# Baseline requirement for libva is 1.6, but 1.10 gets more features
+RDEPEND="
+	>=media-libs/libva-1.10[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] )
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-bad-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+"
diff --git a/media-plugins/gst-plugins-va/metadata.xml b/media-plugins/gst-plugins-va/metadata.xml
new file mode 100644
index 000000000000..629bc56e9d9f
--- /dev/null
+++ b/media-plugins/gst-plugins-va/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 4add240bb2f6..d9a3ce4ae4d6 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 772874fbebff..80be33f20fdd 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -28,7 +28,7 @@ DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0
 DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd1452c279410c547fabc333b6adccaf47fb8e4bbac0c612f9679c8d85317e9b706e5fe10b7c1fc11a4325a14c5b3faafdda46 SHA512 995fb6c9bf1f729eaa08cd5b2003f21c76274f8f3046bd85b771cb86c429fa65cc50f0f4a36396e654a4378125157777b2f0f04a9343b20aa3aef76281395aec
 DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f
 EBUILD mixxx-2.3.3-r1.ebuild 3857 BLAKE2B bcb72472fb83ecbfcc8e1552adcb6e52cfe6406c5b430a14b564b48a4119e64f6180bc6e029abfc0fc1190235ad1c43558143b46f78319121770a23c3760220f SHA512 195025c6f4e47db5557a487eae23a629049cae97f4c299d1b86c106fd5b79c140951f5669ef9416261ccb2546962f3e662a12078cf180dbf154b388db30a4a5f
-EBUILD mixxx-2.3.5.ebuild 3859 BLAKE2B c3bbe1e9aa02d9ad7119b5cce48fb8254a40b9af46a2bca7b44b51d4254fff11859fef977a1c2b08141b62c6749cba0ccf1766ceb4bfa008728aa0fbc8e40ea3 SHA512 06b02b5aecf1fae4373abe94767d2f79c96c34a94ec9c2134310a01716390b8676d0641f9b2cb07ec68f4246052d4cff0f516c41b4005d7105f34dbae8697583
-EBUILD mixxx-2.3.9999.ebuild 3766 BLAKE2B 7188e4a554e4120b63d2bddb7a0e5be07f8f75b3980486ba3d65d449d125b66b33c2cbd018d7a09f1f1e41afccaa70cc3e4e25b26ad1f867d8d8f91bb9f9fdd2 SHA512 0fcd3127613bf0318175967ea623a195664038111b9f8b50f80dd440507f97cff9af3fe8f38702a278fd1bd89f1e6a814eee50bc69d9144d1403df2e1919692f
-EBUILD mixxx-9999.ebuild 2909 BLAKE2B 50a8c6fcf6a5157b199db56c87141e5d6873e2d787f644be29c0ee6e1a68c8fa283aad587a7487844a1e49b85c0f2307070a8d64e83c0dce1831c708438d7736 SHA512 c3f36b618e14ab9d99c89ce1a5ce7d6eb880276b099840bae7707595fc785fa91921f7e39bb1df701b0f7f2429bfa0494bff62a2ca137d059a8911b68e595605
+EBUILD mixxx-2.3.5-r1.ebuild 3784 BLAKE2B 7add5a5f2a60a48eba68d066f582ff95326e4822c01d6786733454e4a0ec302a067a93a866187784658ae96aaef095faced016ac1101564dd5159e052c2abe04 SHA512 808a20dc82b043a7d12412c937e29c15124f4382d3cec557c910c9fe7f3b054519c6793157c170674c9051aeecc421367a33229efc9ecf661bd64c8875e8b3b7
+EBUILD mixxx-2.3.9999.ebuild 3689 BLAKE2B 6d0d2c6a01fe390b5958753f873b995b39492af1a43e32b4c01809da10aa7b9901edd049a4df1ec260edb72071d9ba22d419646b002e39a27d76f8dcd95f84d3 SHA512 f997798193f953f84ee198e6e9052d5e2ddd2cb31f08b3bf527ea371e4af291a240e2ae457473ce27bde6075361f4711f340ed842edfb61104e2e63024fb870c
+EBUILD mixxx-9999.ebuild 2829 BLAKE2B f21165282b08bcd40f3a345bf523c3881efc1268634a2a2f19fa387ad946d447f94c2f22300d5ecb2c553461d1b93edcc2e879962cd83bff9da73cb264664cf0 SHA512 eb55e944cda6a0eff9416415c84cff5e1ad6d35b808b19699e852740587f4020f44b1978236e14254cb8e66bfcede63c88e0eb69b611afdb67932886167c1221
 MISC metadata.xml 903 BLAKE2B 1fd2e01da4d96a257d0ba595e67005e5233503f54ea17c81f65d105a61dc42f84df601cc112ff0a5e99393cbc53a0130b890d96a47cc2b88b59cbe7b9779654d SHA512 7e9dfd69240a57efbdaceb4dcfe71549d7a8c2edba5c81f956407e101cb62a0c51cf231e1e68c029783340189139309dde4fa3e995a231856ea094df09288cd8
diff --git a/media-sound/mixxx/mixxx-2.3.5.ebuild b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
index 69c17499f146..c95ad499da23 100644
--- a/media-sound/mixxx/mixxx-2.3.5.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == *9999 ]] ; then
+HOMEPAGE="https://mixxx.org/"
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
-	if [[ "${PV}" == ?.?.9999 ]] ; then
+	if [[ ${PV} == ?.?.9999 ]] ; then
 		EGIT_BRANCH=${PV%.9999}
 	fi
 	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
@@ -70,9 +70,9 @@ RDEPEND="
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
-	qtkeychain? ( dev-libs/qtkeychain )
+	qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
 	wavpack? ( media-sound/wavpack )
-	"
+"
 	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
 	# available in ::gentoo
 	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
@@ -81,9 +81,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
 "
-BDEPEND="virtual/pkgconfig
+BDEPEND="
 	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5"
+	dev-qt/qtxmlpatterns:5
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.0-docs.patch
@@ -106,10 +108,6 @@ mixxx_set_globals() {
 }
 mixxx_set_globals
 
-src_prepare() {
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		# Not available on Linux yet and requires additional deps
@@ -131,19 +129,14 @@ src_configure() {
 		-DWAVPACK="$(usex wavpack on off)"
 	)
 
-	if [[ "${PV}" == 9999 ]] ; then
+	if [[ ${PV} == 9999 ]] ; then
 		mycmakeargs+=(
 			-DENGINEPRIME="OFF"
-
 		)
 	fi
 	cmake_src_configure
 }
 
-src_compile() {
-	cmake_src_compile
-}
-
 src_install() {
 	cmake_src_install
 	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild
index eed827c69005..8e68e926a377 100644
--- a/media-sound/mixxx/mixxx-2.3.9999.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,10 +6,10 @@ EAPI=8
 inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == *9999 ]] ; then
+HOMEPAGE="https://mixxx.org/"
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
-	if [[ "${PV}" == ?.?.9999 ]] ; then
+	if [[ ${PV} == ?.?.9999 ]] ; then
 		EGIT_BRANCH=${PV%.9999}
 	fi
 	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
@@ -25,7 +25,7 @@ IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack
 RDEPEND="
 	dev-db/sqlite
 	dev-libs/glib:2
-	dev-libs/protobuf:0=
+	dev-libs/protobuf:=
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -70,9 +70,9 @@ RDEPEND="
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
-	qtkeychain? ( dev-libs/qtkeychain )
+	qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
 	wavpack? ( media-sound/wavpack )
-	"
+"
 	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
 	# available in ::gentoo
 	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
@@ -81,13 +81,15 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
 "
-BDEPEND="virtual/pkgconfig
+BDEPEND="
 	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5"
+	dev-qt/qtxmlpatterns:5
+	virtual/pkgconfig
+"
 
 PATCHES=(
-	"${FILESDIR}"/mixxx-9999-docs.patch
-	)
+	"${FILESDIR}"/${PN}-9999-docs.patch
+)
 
 PLOCALES="
 	ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN zh-TW
@@ -104,10 +106,6 @@ mixxx_set_globals() {
 }
 mixxx_set_globals
 
-src_prepare() {
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		# Not available on Linux yet and requires additional deps
@@ -129,19 +127,14 @@ src_configure() {
 		-DWAVPACK="$(usex wavpack on off)"
 	)
 
-	if [[ "${PV}" == 9999 ]] ; then
+	if [[ ${PV} == 9999 ]] ; then
 		mycmakeargs+=(
 			-DENGINEPRIME="OFF"
-
 		)
 	fi
 	cmake_src_configure
 }
 
-src_compile() {
-	cmake_src_compile
-}
-
 src_install() {
 	cmake_src_install
 	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index d6ba056d0789..0447de377599 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == *9999 ]] ; then
+HOMEPAGE="https://mixxx.org/"
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
-	if [[ "${PV}" == ?.?.9999 ]] ; then
+	if [[ ${PV} == ?.?.9999 ]] ; then
 		EGIT_BRANCH=${PV%.9999}
 	fi
 	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
@@ -70,27 +70,24 @@ RDEPEND="
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
-	qtkeychain? ( dev-libs/qtkeychain )
+	qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
 	shout? ( >=media-libs/libshout-2.4.5 )
 	wavpack? ( media-sound/wavpack )
-	"
-
+"
 DEPEND="${RDEPEND}
-	dev-cpp/ms-gsl"
-BDEPEND="virtual/pkgconfig
+	dev-cpp/ms-gsl
+"
+BDEPEND="
 	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5"
+	dev-qt/qtxmlpatterns:5
+	virtual/pkgconfig
+"
 
 PATCHES=(
-	"${FILESDIR}"/mixxx-9999-docs.patch
-	)
-
-src_prepare() {
-	cmake_src_prepare
-}
+	"${FILESDIR}"/${PN}-9999-docs.patch
+)
 
 src_configure() {
-
 	local mycmakeargs=(
 		-DFAAD="$(usex aac on off)"
 		-DFFMPEG="$(usex ffmpeg on off)"
@@ -110,19 +107,14 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=OFF
 	)
 
-	if [[ "${PV}" == 9999 ]] ; then
-	local mycmakeargs+=(
-		-DENGINEPRIME="OFF"
-
-	)
+	if [[ ${PV} == 9999 ]] ; then
+		mycmakeargs+=(
+			-DENGINEPRIME="OFF"
+		)
 	fi
 	cmake_src_configure
 }
 
-src_compile() {
-	cmake_src_compile
-}
-
 src_install() {
 	cmake_src_install
 	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 67647a784210..8801409af3e4 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 3f42c420ed3f..9ce212ce29ae 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,8 +1,5 @@
-AUX qmplay2-22.10.23-fix-includes.patch 869 BLAKE2B e84d97476114c0b48930530ebeaf90032af650080ac517d78986dfe443bf9beb0e128381c39880a78df1762eb85e51f0eab5275d7b148e631138e50d656ec33b SHA512 05025c688e7885c10856669b4e943daf54dfd9580d1e4ae77d344ac0d7ab97856b588e6765ae5a4cdbf7508d24e8affaf897efb01d0c328679b2916f98a3405a
 AUX qmplay2-23.02.05-fix-libva-glx.patch 619 BLAKE2B c3aeeb812c6012bd4627b984f2fb769e88897030f9f73920102d0e95c179773854ab58002cc97b2df4ba1cea317d725a1a8e0e180143677f16067d6f96a32c73 SHA512 1ae7ab4b443e3ab439fe33748c33484f1d83a20a39d5c9c14a292c9327a4bcd2b1e0c3c456bb82aff6fca84a3e9039174e6f4d2e0beeba3b2427acbd3c389c80
-DIST QMPlay2-src-22.10.23.tar.xz 1414804 BLAKE2B c0db1187538be8ab0806abd41fbfdae5a71dda450505af1956989a3ccc10fa52997b8652f280cd66837d12a84a7a058783b65df3d4bd35665c92f1262cd8d004 SHA512 80c9408a9085084857b5b433f009bf62784cf73ceb90218ec09132be227aae97136095811ffa1211375dcbfc1f51cbefaa3690c56fc8df51d9b1cf022ce0709f
 DIST QMPlay2-src-23.02.05.tar.xz 1428992 BLAKE2B 7296ed089306e50e1051c33c23dae30f14cbb166b9d9ea8c184e8aa027a261a658e1d7770c7d574784a5cde4890c66e2104927f4473f484562378c956bea4b3f SHA512 d2e998a2df08c98b7e0232de693ee17b5c703793e2b1edadde300ca39998f40f7ad58b5850ee1f8cddf1dd9489c7f96e664db7e9deba01a612d97707aad849c0
-EBUILD qmplay2-22.10.23.ebuild 3381 BLAKE2B 7fe62b58b88d5b42dc91c1984aa8c1d1964611c7224e258b7413af8c8d71b57408332b4c235ca82bb489896d9c223c3bd496ba2f7ae05d07542f2fd88523ec45 SHA512 582a316117b54870686c734c6ddc283c8102881502e8dfc4d0e6f4ad1f918431361694cab88b2206f75afc07e318aaa2b13ea7d19abcfd21fc3578c5ea4fa19f
-EBUILD qmplay2-23.02.05.ebuild 3392 BLAKE2B 1e1fa20b9fd2dceae2398761d6b2fa416f6f93175277185c7de3649297c40c74846fb9663639660bb78403ae009edaa61a043f7c8f209ca81d32f7c7eb34a897 SHA512 4bc90041cdc1e869d4047241947be06157eae7eb64ea999260d0dcafc1042df5551e1d753d6db9be05bb04f858906743d19898f1be28d8c5e3fb2e961580a364
-EBUILD qmplay2-9999.ebuild 3326 BLAKE2B f5038c99fbd446e8ed67ec09a14bf45823618b8d30f415baedb71b5ec72274c20f5c91ec42e230419dec45a610572de80bb9a1a079853c258f24224a7014b5fa SHA512 83d6efceca7050ed8df053488cbf0b19004daa6d0723602bb5cd408b1653515ea980bcc5b295f95bfdeb6f46b38a1e92c5dc0a989a26de67dc00386e50993789
+EBUILD qmplay2-23.02.05-r1.ebuild 3389 BLAKE2B 12be8718cbd3d0c66d96f5ef50cceac405e4950adaec21cc4a046079e0060313a15941cabce43608b4b749832ccdf6f3f45b250caa9f2b0ec77e0a5bc83028c0 SHA512 6b7e3da84decd8c34d8e0a3c74016a276df649aec12749bf5920ee7a754228b8586beeca92125cb86ac4532762430a2add693624909557f5b61021ed22fff1d9
+EBUILD qmplay2-9999.ebuild 3323 BLAKE2B 68fb9bd6ac5f06f31813df124a23b6078ae42034d9bad0d90bd1ba7af300984349d19a45a9b01fc103c2d89eff1493b2dce163096690388ac5b81196722ac1a4 SHA512 d3aad38f77c863e8f45e341934715695cbbd800d533801eccdfe9769868e948e8a0119a1af0d1de67f2c4d27463b5eba52fdbdef6d5d497b54af63ebb3ef7818
 MISC metadata.xml 1287 BLAKE2B f04c4032dd3f32f10e33c551d364a9914d7663448b293ab9161da4741f53e65438749c1cd14b2ab0f5dd6a231109763642e53932d2705170a7e063e594acae36 SHA512 3f480f4d3cff62300e8eed043f16fe2a0f5cb8572be5fa00710b86036b93650b852168b7e01c2611c95755205d1a33883d67dfb8fd187d87c459d923e77c9fbd
diff --git a/media-video/qmplay2/files/qmplay2-22.10.23-fix-includes.patch b/media-video/qmplay2/files/qmplay2-22.10.23-fix-includes.patch
deleted file mode 100644
index eb77927f6ea9..000000000000
--- a/media-video/qmplay2/files/qmplay2-22.10.23-fix-includes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://github.com/zaps166/QMPlay2/pull/541
-
-fix include memory with USE_VULKAN=OFF
-
-Those header files are using std::shared_ptr from memory header even
-when USE_VULKAN is OFF, so we must include them unconditionally.
-
-Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
---- a/src/qmplay2/LibASS.hpp
-+++ b/src/qmplay2/LibASS.hpp
-@@ -23,6 +23,7 @@
- #include <QByteArray>
- #include <QList>
-
-+#include <memory>
- #include <set>
-
- class Settings;
-@@ -35,7 +36,6 @@ struct ass_renderer;
- struct ass_image;
-
- #ifdef USE_VULKAN
--#include <memory>
- namespace QmVk {
- class BufferPool;
- }
---- a/src/qmplay2/QMPlay2OSD.hpp
-+++ b/src/qmplay2/QMPlay2OSD.hpp
-@@ -25,14 +25,13 @@
- #include <QRect>
-
- #include <functional>
-+#include <memory>
- #include <vector>
- #include <mutex>
-
- #ifdef USE_VULKAN
- #   include <QVector4D>
-
--#   include <memory>
--
- namespace QmVk {
-
- class Buffer;
diff --git a/media-video/qmplay2/qmplay2-22.10.23.ebuild b/media-video/qmplay2/qmplay2-22.10.23.ebuild
deleted file mode 100644
index 1ef2e8a50818..000000000000
--- a/media-video/qmplay2/qmplay2-22.10.23.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
-HOMEPAGE="https://github.com/zaps166/QMPlay2"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
-else
-	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
-	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
-	modplug notifications opengl pipewire portaudio pulseaudio sid shaders
-	+taglib vaapi vdpau videofilters visualizations vulkan xv"
-
-REQUIRED_USE="
-	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
-	shaders? ( vulkan )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
-	alsa? ( media-libs/alsa-lib )
-	cdio? ( dev-libs/libcdio[cddb] )
-	extensions? ( dev-qt/qtdeclarative:5 )
-	gme? ( media-libs/game-music-emu )
-	libass? ( media-libs/libass )
-	opengl? ( virtual/opengl )
-	pipewire? ( media-video/pipewire )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sid? ( media-libs/libsidplayfp )
-	shaders? ( >=media-libs/shaderc-2020.1 )
-	taglib? ( media-libs/taglib	)
-	vaapi? (
-		>=media-video/ffmpeg-4.1.3[vaapi]
-		media-libs/libva[X]
-	)
-	vdpau? ( media-video/ffmpeg[vdpau] )
-	videofilters? ( dev-qt/qtconcurrent:5 )
-	vulkan? (
-		>=dev-qt/qtgui-5.14.1:5[vulkan]
-		>=media-libs/vulkan-loader-1.2.133
-	)
-	xv? ( x11-libs/libXv )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-includes.patch"
-)
-
-src_prepare() {
-	# disable compress man pages
-	sed -r \
-		-e 's/if\(GZIP\)/if\(TRUE\)/' \
-		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
-		-i src/gui/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# core
-		-DUSE_LINK_TIME_OPTIMIZATION=false
-		-DUSE_UPDATES=OFF
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_DBUS_SUSPEND=ON
-		-DUSE_FREEDESKTOP_NOTIFICATIONS=ON
-		-DUSE_LIBASS=$(usex libass)
-		-DUSE_NOTIFY=$(usex notifications)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_VULKAN=$(usex vulkan)
-		-DUSE_GLSLC=$(usex shaders)
-		-DUSE_XVIDEO=$(usex xv)
-
-		# ffmpeg
-		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
-		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
-		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
-
-		# chiptune
-		-DUSE_CHIPTUNE_GME=$(usex gme)
-		-DUSE_CHIPTUNE_SID=$(usex sid)
-
-		# modules
-		-DUSE_AUDIOFILTERS=$(usex audiofilters)
-		-DUSE_CUVID=$(usex cuvid)
-		-DUSE_INPUTS=$(usex inputs)
-		-DUSE_MODPLUG=$(usex modplug)
-		-DUSE_PIPEWIRE=$(usex pipewire)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DUSE_TAGLIB=$(usex taglib)
-		-DUSE_VIDEOFILTERS=$(usex videofilters)
-		-DUSE_VISUALIZATIONS=$(usex visualizations)
-
-		# extensions
-		-DUSE_EXTENSIONS=$(usex extensions)
-	)
-
-	if use extensions; then
-		# Move inside an if, to remove unused option warning
-		mycmakeargs+=(
-			-DUSE_LASTFM=ON
-			-DUSE_LYRICS=ON
-			-DUSE_MEDIABROWSER=ON
-			-DUSE_MPRIS2=ON
-		)
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		mycmakeargs+=( -DUSE_GIT_VERSION=true )
-	else
-		mycmakeargs+=( -DUSE_GIT_VERSION=false )
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-video/qmplay2/qmplay2-23.02.05.ebuild b/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
index 04d454c891d3..e5d94c7d4ad9 100644
--- a/media-video/qmplay2/qmplay2-23.02.05.ebuild
+++ b/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	opengl? ( virtual/opengl )
 	pipewire? ( media-video/pipewire )
 	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	sid? ( media-libs/libsidplayfp )
 	shaders? ( >=media-libs/shaderc-2020.1 )
 	taglib? ( media-libs/taglib	)
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index dcf4fed040ad..5844dfa91690 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,7 @@ RDEPEND="
 	opengl? ( virtual/opengl )
 	pipewire? ( media-video/pipewire )
 	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	sid? ( media-libs/libsidplayfp )
 	shaders? ( >=media-libs/shaderc-2020.1 )
 	taglib? ( media-libs/taglib	)
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 6da0000241d3..7465da3c0f7a 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c207772130cf..44c4ed606384 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 30 May 2023 19:40:06 +0000
+Wed, 31 May 2023 01:40:05 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index a5f903983dcb..3b06a857421e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546124 BLAKE2B 03eedd2cb5221fcee8277950d4f0eaa63c4d89fcff016ce8237c33b86bf66d041421b4e3f1a61bf4adc37506d7e39938fe03c96872837bf059265711ec94186b SHA512 976cf7b2e2c60b59da2ac608b5352a8e04d8b7f36613abe781d8b94ac705640f28c73207f611bff76acea9c931e7346fde7aa7b850f0d9e03738d3eaa8c5ff00
-TIMESTAMP 2023-05-30T19:40:09Z
+TIMESTAMP 2023-05-31T01:40:08Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR2URlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR2pXhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBN/g//TtPGK/+Bp4/G4LTYsqoaD78FQubTOSCyn898pIVtccdLvCTsLs3QkMwt
-WvJTAh2aO8XDtZ/GoeB7pdJF2vO6xLXgqcFdPsq5n/u7xJNShUQl5eUJl4SdUggS
-ADabJZmhWO6+sUgrWsGGJFRQkZDbvf0tSbo8VLvZ7tqg73q5zm7N8fFw+ZxUnG9w
-Uh1sb38EZ1M+u3p7slm/yyUkEHUXfN3V80uvIgAU34ekQE3hTluv46w+A3Ou7jQ4
-zVjzR9HSrQ7/s69AswSYp9rIm2SRIDk35xgHzxDdU/mILa91UiTUewK30XcyrOLB
-W+vhQUNWpvakN80AZx0C0XNvqFgjA3C0vpeigBtMVFXRK7fRnXrdPiGNSM6FsJ/W
-NGzezrVy0BR+Ir2PA8JeCEp6bY5Sn+fCFfR+/6aI51/LdTzsuvFlaJ/fg39eV1Dx
-v4fAYBeQjyHa0mStFtKKL663eQ/FPoRH7KF91K+DVVZytEFmNXOZNxgDdFeEAGHE
-s8GT4edFn5FVv5ia2Kd4FxXjb3FJ2iIrvoh2Q0X+VccrY1UROoxuFZAo8dY0VLZD
-M5Ha/lxDrHlP8MpLEQaXPANDxKatXo0BOU15H+dUj+SwkPLpFLUZ40jhSDbZ5QeL
-xPtZHpoUSwnXOMWrh+9whKME/th/F1D2bwYIZjlJSvLi7eWcWs8=
-=TR2l
+klDWIg//R8KECVKeKKA9VwwYvpYyxnc1sOmu6KsSuT9gQBorumuHnuqhOpZch93h
+j+I8avQko/uPkyDVudha9XUkPxL6SRduNSqp5gMtXICfuAT2u0m2gOECLi2XblXW
+N+wt9Otsed9VhgXYtfvyymRBxC+OVXSl/MKZynbVnAY8KRjAVIalVOzWo3E/lsfF
+J0cbAX6SoeOcM1hsieKCf1S3yatK2DnP9yF7Pn8WatOwfMNuIYuHP4x9H3/jaHLu
+W/VYrz6ilfuYiYbOMkjrR8innXzhuUab6GyGHTo6x3F3Rz+iGVFCZfz5oEuRMlVB
+eQXy4wz6Ebg6FoOlKbPIu3O3eJhH6EZEYuNtyQCCnIiAhwlAMERCgjekdkPEpIYQ
+EPazSbiIGVjkSKQqUaNadtO1+KwNeMc+8HBWNgcnJexUNk2t2akVWGP/oaDX6jIB
+1bavbbIIVkuO5gHcg2g1c7DdClY+GOXyD/xwR7P6gY1AiuFHHa8L+t5tyJr/kBT4
+TUBQwotokAfEm7brqwDqLi2xvo4sONCx2CjZeqY9Q+Cdz1CVDKQ/4YpIiU2aNfMm
+K5MkBqcKb48prfo+LslN5N6WGAlvjkiv0QfqXVcdD9v08IPiMwMR8wOBBDlaL8C8
+ZS3+G4SrC7HlsGwLorKKoQB4kfh+3CQBBSy8XSeAoRp+3wVs78Q=
+=gum4
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c207772130cf..44c4ed606384 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 30 May 2023 19:40:06 +0000
+Wed, 31 May 2023 01:40:05 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index bd9ecbeb7eb6..51977c9f2381 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 177d31abe84f..925d66813a2a 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/ryzen_smu-0.1.2_p20211205-r1 b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20211205-r1
index 3c1759b824fc..bf8ddfaf2e7b 100644
--- a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20211205-r1
+++ b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20211205-r1
@@ -12,5 +12,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slashbeast/distfiles/ryzen_smu/ryzen_smu-0.1.2_p20211205.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	b5f765ee7d693eb6478df913936788fc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	11c01a51c0ea7919b41d38e3c0d5b5cf	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=52bb7b293546b7f0a4248a9c0f0c9b65
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index f4ff08fe4b3a..f3368914ea24 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.9-r5 b/metadata/md5-cache/app-arch/brotli-1.0.9-r5
index f77847989e2b..795b13805cc8 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r5
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r5
@@ -1,17 +1,17 @@
-BDEPEND=python? ( >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=python? ( >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) )
+DEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) )
 DESCRIPTION=Generic-purpose lossless compression algorithm
 EAPI=8
 HOMEPAGE=https://github.com/google/brotli/
 INHERIT=cmake-multilib distutils-r1
-IUSE=python static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 debug
+IUSE=python static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT python? ( Apache-2.0 )
-RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) )
-REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 ) )
+RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) )
+REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/brotli-1.0.9.testdata.tar.xz )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	distutils-r1	57f007adcdf3953627f14277c7eae6e0	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=547c27e494a649c771e80e9460c073af
+_md5_=1102128158c053273dddc2dea4f1451f
diff --git a/metadata/md5-cache/app-arch/brotli-9999 b/metadata/md5-cache/app-arch/brotli-9999
index 7bfd89b7f4a5..a9ec5b313cb6 100644
--- a/metadata/md5-cache/app-arch/brotli-9999
+++ b/metadata/md5-cache/app-arch/brotli-9999
@@ -1,16 +1,16 @@
-BDEPEND=python? ( >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python? ( >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) )
+DEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) )
 DESCRIPTION=Generic-purpose lossless compression algorithm
 EAPI=8
 HOMEPAGE=https://github.com/google/brotli/
 INHERIT=cmake-multilib distutils-r1 git-r3
-IUSE=python static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 debug
+IUSE=python static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
 LICENSE=MIT python? ( Apache-2.0 )
 PROPERTIES=live
-RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) )
-REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 ) )
+RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) )
+REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) )
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	distutils-r1	57f007adcdf3953627f14277c7eae6e0	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=625b91c4e856addcdc6a7daa635d4358
+_md5_=dc404d841ef2015898daf4d1f4d33705
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index ecca8c69b3f4..325ae860bcc7 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.40 b/metadata/md5-cache/app-crypt/gnupg-2.2.40
deleted file mode 100644
index a1973bf78329..000000000000
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.40
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 )
-DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
-EAPI=8
-HOMEPAGE=https://gnupg.org/
-INHERIT=flag-o-matic systemd toolchain-funcs verify-sig
-IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.40.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.2.40.tar.bz2.sig )
-_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=959d9fa6669e0a29d952b738ccba22f9
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.3.8 b/metadata/md5-cache/app-crypt/gnupg-2.3.8
deleted file mode 100644
index 839bac89f844..000000000000
--- a/metadata/md5-cache/app-crypt/gnupg-2.3.8
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1:= >=dev-libs/libgpg-error-1.41 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) tofu? ( >=dev-db/sqlite-3.27 ) tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) ssl? ( >=net-libs/gnutls-3.0:0= )
-DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
-EAPI=8
-HOMEPAGE=https://gnupg.org/
-INHERIT=flag-o-matic systemd toolchain-funcs verify-sig
-IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1:= >=dev-libs/libgpg-error-1.41 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) tofu? ( >=dev-db/sqlite-3.27 ) tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) ssl? ( >=net-libs/gnutls-3.0:0= ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
-REQUIRED_USE=test? ( tofu )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.3.8.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.3.8.tar.bz2.sig )
-_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=8cde454e6d2e35831d1a6d3b202edb18
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.4.0 b/metadata/md5-cache/app-crypt/gnupg-2.4.2
index 65c70ef93789..0b91a3cf5106 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.4.0
+++ b/metadata/md5-cache/app-crypt/gnupg-2.4.2
@@ -12,6 +12,6 @@ RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1:= >=dev-libs/libgp
 REQUIRED_USE=test? ( tofu )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2.sig )
+SRC_URI=mirror://gnupg/gnupg/gnupg-2.4.2.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.4.2.tar.bz2.sig )
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source	15ce2b6ae214f3abe70892ce1e517abd	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=b158e18496316144f6e5febf0370ef7c
+_md5_=d99a6a1bbe2904b5e894131232022a7e
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 55dd10253010..a1531aa776d8 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/go-1.19.9 b/metadata/md5-cache/dev-lang/go-1.19.9
index 17515b23b14b..da8794d9827c 100644
--- a/metadata/md5-cache/dev-lang/go-1.19.9
+++ b/metadata/md5-cache/dev-lang/go-1.19.9
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://go.dev
 INHERIT=toolchain-funcs
 IUSE=abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=arm? ( sys-devel/binutils[gold] ) arm64? ( sys-devel/binutils[gold] )
 RESTRICT=strip
 SLOT=0/1.19.9
 SRC_URI=https://storage.googleapis.com/golang/go1.19.9.src.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bb1675d42cb0bec2025a6935d44dec94
+_md5_=1f725cf994775515f3446ab24915650b
diff --git a/metadata/md5-cache/dev-lang/go-1.20.4 b/metadata/md5-cache/dev-lang/go-1.20.4
index b247914a13a5..543490ad9d89 100644
--- a/metadata/md5-cache/dev-lang/go-1.20.4
+++ b/metadata/md5-cache/dev-lang/go-1.20.4
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://go.dev
 INHERIT=toolchain-funcs
 IUSE=abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=arm? ( sys-devel/binutils[gold] ) arm64? ( sys-devel/binutils[gold] )
 RESTRICT=strip
 SLOT=0/1.20.4
 SRC_URI=https://storage.googleapis.com/golang/go1.20.4.src.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bb1675d42cb0bec2025a6935d44dec94
+_md5_=1f725cf994775515f3446ab24915650b
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.34 b/metadata/md5-cache/dev-lang/orc-0.4.34
new file mode 100644
index 000000000000..215d86ff584b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/orc-0.4.34
@@ -0,0 +1,14 @@
+BDEPEND=gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.3 ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=The Oil Runtime Compiler, a just-in-time compiler for array operations
+EAPI=8
+HOMEPAGE=https://gstreamer.freedesktop.org/
+INHERIT=meson-multilib
+IUSE=gtk-doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD BSD-2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gstreamer.freedesktop.org/src/orc/orc-0.4.34.tar.xz
+_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=4155219dc0e2f6a63e40a1bc075e9b4c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 8188f7d160ea..7f81d2476ef2 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/a2wsgi-1.7.0 b/metadata/md5-cache/dev-python/a2wsgi-1.7.0
index 6faa32b88db6..2fc26d8f1a55 100644
--- a/metadata/md5-cache/dev-python/a2wsgi-1.7.0
+++ b/metadata/md5-cache/dev-python/a2wsgi-1.7.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( <dev-python/asgiref-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/asgiref-3.2.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httpx-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pdm-pep517-1.1.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( <dev-python/asgiref-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/asgiref-3.2.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/httpx-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pdm-pep517-1.1.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Convert WSGI app to ASGI app or ASGI app to WSGI app
 EAPI=8
 HOMEPAGE=https://github.com/abersheeran/a2wsgi/ https://pypi.org/project/a2wsgi/
 INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/a/a2wsgi/a2wsgi-1.7.0.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bec3a9533709d511ab855df14089fd39
+_md5_=13f422884e3f11063c063da09fbfa379
diff --git a/metadata/md5-cache/dev-python/hatchling-1.17.0 b/metadata/md5-cache/dev-python/hatchling-1.17.0
index a0092b79ac0f..9ac796b0420d 100644
--- a/metadata/md5-cache/dev-python/hatchling-1.17.0
+++ b/metadata/md5-cache/dev-python/hatchling-1.17.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/editables-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pathspec-0.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/trove-classifiers[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_pypy3? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/editables-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pathspec-0.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/trove-classifiers[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=>=dev-python/editables-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pathspec-0.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/trove-classifiers[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_pypy3? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) test? ( >=dev-python/editables-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pathspec-0.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pluggy-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/trove-classifiers[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Modern, extensible Python build backend
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/hatch/archive/hatchling-v1.17.0.tar.gz -> hatch-hatchling-v1.17.0.gh.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=24634e84cd5d20f966b3c78119872627
+_md5_=94cc2098897f976b448a6a6a29c7dfef
diff --git a/metadata/md5-cache/dev-python/httpx-0.24.1 b/metadata/md5-cache/dev-python/httpx-0.24.1
index d0442744a2aa..76f1b9f82ebe 100644
--- a/metadata/md5-cache/dev-python/httpx-0.24.1
+++ b/metadata/md5-cache/dev-python/httpx-0.24.1
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/hatch-fancy-pypi-readme[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/anyio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/h2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/socksio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uvicorn[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httpcore-0.18[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpcore-0.15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sniffio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] cli? ( =dev-python/click-8*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pygments-2*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=dev-python/hatch-fancy-pypi-readme[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/anyio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/h2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/socksio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/uvicorn[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/httpcore-0.18[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpcore-0.15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sniffio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] cli? ( =dev-python/click-8*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =dev-python/pygments-2*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Fully-featured HTTP client which provides sync and async APIs
 EAPI=8
 HOMEPAGE=https://www.python-httpx.org/ https://github.com/encode/httpx/ https://pypi.org/project/httpx/
 INHERIT=distutils-r1 optfeature
-IUSE=cli test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+IUSE=cli test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
-RDEPEND=dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httpcore-0.18[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpcore-0.15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sniffio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] cli? ( =dev-python/click-8*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pygments-2*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/httpcore-0.18[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpcore-0.15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sniffio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] cli? ( =dev-python/click-8*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =dev-python/pygments-2*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/httpx/archive/0.24.1.tar.gz -> httpx-0.24.1.gh.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5c6deac5dafb082940ef1b8aa6d9ed0b
+_md5_=ded742dcd537c4098f46f0022f80c50f
diff --git a/metadata/md5-cache/dev-python/pytest-httpx-0.22.0 b/metadata/md5-cache/dev-python/pytest-httpx-0.22.0
index b9288fb458f5..8f3eb00d7df1 100644
--- a/metadata/md5-cache/dev-python/pytest-httpx-0.22.0
+++ b/metadata/md5-cache/dev-python/pytest-httpx-0.22.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( =dev-python/httpx-0.24*[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pytest-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( =dev-python/httpx-0.24*[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/pytest-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Send responses to HTTPX using pytest
 EAPI=8
 HOMEPAGE=https://colin-b.github.io/pytest_httpx/ https://github.com/Colin-b/pytest_httpx/ https://pypi.org/project/pytest-httpx/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND==dev-python/httpx-0.24*[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pytest-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND==dev-python/httpx-0.24*[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/pytest-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Colin-b/pytest_httpx/archive/v0.22.0.tar.gz -> pytest-httpx-0.22.0.gh.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cc0d8206aeabade7936cc8b7f6c0ec48
+_md5_=3c8ce3e65394bc6752bde29e6a1753f6
diff --git a/metadata/md5-cache/dev-python/uvicorn-0.22.0 b/metadata/md5-cache/dev-python/uvicorn-0.22.0
index 0b6e5d6eb81a..1e520f67c5d2 100644
--- a/metadata/md5-cache/dev-python/uvicorn-0.22.0
+++ b/metadata/md5-cache/dev-python/uvicorn-0.22.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/a2wsgi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dotenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/websockets-10.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wsproto[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test-rust? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/watchfiles[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/asgiref-3.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/h11-0.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/a2wsgi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dotenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/websockets-10.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/wsproto[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test-rust? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/watchfiles[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) test? ( >=dev-python/asgiref-3.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/h11-0.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Lightning-fast ASGI server implementation
 EAPI=8
 HOMEPAGE=https://www.uvicorn.org/ https://github.com/encode/uvicorn/ https://pypi.org/project/uvicorn/
 INHERIT=distutils-r1 optfeature
-IUSE=test-rust test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+IUSE=test-rust test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/asgiref-3.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/h11-0.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=>=dev-python/asgiref-3.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/h11-0.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/uvicorn/archive/0.22.0.tar.gz -> uvicorn-0.22.0.gh.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8471955445d70bbec1185e5ccd2c6dc7
+_md5_=2796eabb6e67305ecd96d42fb68974b7
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 10c6105af717..1f21a23a05b3 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/gitlab-runner-16.0.1 b/metadata/md5-cache/dev-util/gitlab-runner-16.0.1
new file mode 100644
index 000000000000..bc1edbbf4c34
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gitlab-runner-16.0.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=acct-group/gitlab-runner acct-user/gitlab-runner
+DESCRIPTION=The official GitLab Runner, written in Go
+EAPI=8
+HOMEPAGE=https://gitlab.com/gitlab-org/gitlab-runner
+INHERIT=go-module systemd tmpfiles
+KEYWORDS=amd64 ~ppc64 ~riscv
+LICENSE=MIT
+RDEPEND=acct-group/gitlab-runner acct-user/gitlab-runner virtual/tmpfiles
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v16.0.1/gitlab-runner-v16.0.1.tar.bz2 -> gitlab-runner-16.0.1.tar.bz2 https://dev.gentoo.org/~williamh/dist/gitlab-runner-16.0.1-deps.tar.xz
+_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=eace2c39b62cd412c11c9ed44327cade
diff --git a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1 b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
deleted file mode 100644
index b37282605e0c..000000000000
--- a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Kernel module for dev-util/sysdig
-EAPI=7
-HOMEPAGE=https://sysdig.com/
-INHERIT=cmake linux-mod
-IUSE=dist-kernel
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT GPL-2 )
-RDEPEND=!<=dev-util/sysdig-0.26.4[modules] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=https://github.com/draios/sysdig/archive/0.27.1.tar.gz -> sysdig-0.27.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	073dc5c9bc044e85d704b503ebc764a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=800fffc374f26390889cfd16c003d5e6
diff --git a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1-r1 b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1-r1
new file mode 100644
index 000000000000..7cbee6baeb2b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=virtual/linux-sources
+DESCRIPTION=Kernel module for dev-util/sysdig
+EAPI=8
+HOMEPAGE=https://sysdig.com/
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=cmake linux-mod-r1
+IUSE=dist-kernel modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT GPL-2 )
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0
+SRC_URI=https://github.com/draios/sysdig/archive/0.27.1.tar.gz -> sysdig-0.27.1.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	11c01a51c0ea7919b41d38e3c0d5b5cf	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=04ee52ee0fa63c4d21b788c4efd94cd9
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index bd87ae38196f..af6d731ddf36 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/xpadneo-0.9.5-r1 b/metadata/md5-cache/games-util/xpadneo-0.9.5-r1
index 01c1bd48bd6f..06b05bb01fd0 100644
--- a/metadata/md5-cache/games-util/xpadneo-0.9.5-r1
+++ b/metadata/md5-cache/games-util/xpadneo-0.9.5-r1
@@ -12,5 +12,5 @@ LICENSE=GPL-3
 RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 SLOT=0
 SRC_URI=https://github.com/atar-axis/xpadneo/archive/v0.9.5.tar.gz -> xpadneo-0.9.5.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	b5f765ee7d693eb6478df913936788fc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	11c01a51c0ea7919b41d38e3c0d5b5cf	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=88c9c786edec3da5a64c72798cc31f4a
diff --git a/metadata/md5-cache/games-util/xpadneo-9999 b/metadata/md5-cache/games-util/xpadneo-9999
index 945e683f5b42..09c0e9aed207 100644
--- a/metadata/md5-cache/games-util/xpadneo-9999
+++ b/metadata/md5-cache/games-util/xpadneo-9999
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 SLOT=0
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	b5f765ee7d693eb6478df913936788fc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	11c01a51c0ea7919b41d38e3c0d5b5cf	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=88c9c786edec3da5a64c72798cc31f4a
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index c2f00b5f9158..f57cbbbc82f1 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/gimp-9999 b/metadata/md5-cache/media-gfx/gimp-9999
index 017ba75375eb..7fa814af2e35 100644
--- a/metadata/md5-cache/media-gfx/gimp-9999
+++ b/metadata/md5-cache/media-gfx/gimp-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test )
 SLOT=0/3
 _eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	915ec7c25e08d7886558215e6809ca1e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vala	1343f639cc74d2aa8b36fc08677da58d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=74506f2d29733eec8bb6ae4e3a3b84cc
+_md5_=479929f733e5ba7b7c49a3e6bb6b6bfb
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index fd74a8cb7dc6..b725d71df8bc 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.22.3 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.22.3
deleted file mode 100644
index 5c4ad424860c..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.22.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig virtual/perl-JSON-PP
-DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0: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(-)?] >=media-libs/gstreamer-1.22:1.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(-)?] >=media-libs/gst-plugins-bad-1.22.3:1.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(-)?]
-DESCRIPTION=Microsoft Multi Media Server source plugin for GStreamer
-EAPI=7
-HOMEPAGE=https://gstreamer.freedesktop.org/
-INHERIT=gstreamer-meson
-IUSE=test 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0: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(-)?] >=media-libs/gstreamer-1.22:1.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(-)?] >=media-libs/gst-plugins-bad-1.22.3:1.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(-)?]
-RESTRICT=test
-SLOT=1.0
-SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.3.tar.xz
-_eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	gstreamer-meson	da83e5c4466382945ae200e6ccace9ed	meson	915ec7c25e08d7886558215e6809ca1e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=50e9dbd1731270b75450431515fcf1b8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.22.3 b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.22.3-r1
index 8a33053f777d..212394f4f5e3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.22.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.22.3-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.3.tar.xz
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	gstreamer-meson	da83e5c4466382945ae200e6ccace9ed	meson	915ec7c25e08d7886558215e6809ca1e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9464e5835a12f494f2e24c8c7f9e60c2
+_md5_=6a836328a6fe59a11f82ddf6889d0c27
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-va-1.22.3 b/metadata/md5-cache/media-plugins/gst-plugins-va-1.22.3
new file mode 100644
index 000000000000..2c40a72f5ab3
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-va-1.22.3
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) dev-util/glib-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig virtual/perl-JSON-PP
+DEFINED_PHASES=compile configure install setup test
+DEPEND=>=media-libs/libva-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) orc? ( >=dev-lang/orc-0.4.33[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/gstreamer-1.22.3:1.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(-)?,introspection?] >=media-libs/gst-plugins-base-1.22.3:1.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(-)?] >=media-libs/gst-plugins-bad-1.22.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0: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(-)?] >=media-libs/gstreamer-1.22:1.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(-)?] >=media-libs/gst-plugins-bad-1.22.3:1.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(-)?]
+DESCRIPTION=Hardware accelerated video decoding through VA-API plugin for GStreamer
+EAPI=7
+HOMEPAGE=https://gstreamer.freedesktop.org/
+INHERIT=gstreamer-meson python-any-r1
+IUSE=+introspection +orc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1+
+RDEPEND=>=media-libs/libva-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) orc? ( >=dev-lang/orc-0.4.33[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/gstreamer-1.22.3:1.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(-)?,introspection?] >=media-libs/gst-plugins-base-1.22.3:1.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(-)?] >=media-libs/gst-plugins-bad-1.22.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0: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(-)?] >=media-libs/gstreamer-1.22:1.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(-)?] >=media-libs/gst-plugins-bad-1.22.3:1.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(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.3.tar.xz
+_eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	gstreamer-meson	da83e5c4466382945ae200e6ccace9ed	meson	915ec7c25e08d7886558215e6809ca1e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=53b0334726d711bd1851bd6dfe165fbf
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 9afe1868c1a5..36da5418566d 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/mixxx-2.3.5 b/metadata/md5-cache/media-sound/mixxx-2.3.5-r1
index 778c205855f9..7f3953d24fe4 100644
--- a/metadata/md5-cache/media-sound/mixxx-2.3.5
+++ b/metadata/md5-cache/media-sound/mixxx-2.3.5-r1
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+BDEPEND=dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) wavpack? ( media-sound/wavpack ) dev-qt/qtconcurrent:5
+DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] ) wavpack? ( media-sound/wavpack ) dev-qt/qtconcurrent:5
 DESCRIPTION=Advanced Digital DJ tool based on Qt
 EAPI=8
-HOMEPAGE=https://www.mixxx.org/
+HOMEPAGE=https://mixxx.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake xdg udev
 IUSE=aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack l10n_ca l10n_cs l10n_de l10n_en l10n_es l10n_fi l10n_fr l10n_gl l10n_id l10n_it l10n_ja l10n_kn l10n_nl l10n_pl l10n_pt l10n_ro l10n_ru l10n_sl l10n_sq l10n_sr l10n_tr l10n_zh-CN l10n_zh-TW
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) wavpack? ( media-sound/wavpack )
+RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=https://github.com/mixxxdj/mixxx/archive/refs/tags/2.3.5.tar.gz -> mixxx-2.3.5.tar.gz l10n_ca? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ca.pdf ) l10n_cs? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-cs.pdf ) l10n_de? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-de.pdf ) l10n_en? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf ) l10n_es? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-es.pdf ) l10n_fi? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fi.pdf ) l10n_fr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fr.pdf ) l10n_gl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-gl.pdf ) l10n_id? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-id.pdf ) l10n_it? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-it.pdf ) l10n_ja? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ja-JP.pdf ) l10n_kn? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-kn.pdf ) l10n_nl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-nl.pdf ) l10n_pl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pl.pdf ) l10n_pt? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pt.pdf ) l10n_ro? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ro.pdf ) l10n_ru? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ru.pdf ) l10n_sl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sl.pdf ) l10n_sq? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sq.pdf ) l10n_sr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sr.pdf ) l10n_tr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-tr.pdf ) l10n_zh-CN? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-CN.pdf ) l10n_zh-TW? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-TW.pdf ) https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5fe5629edc6a0bbb8923ded7c432b2b6
+_md5_=4b3344cc7f66757b536e1d404b57209a
diff --git a/metadata/md5-cache/media-sound/mixxx-2.3.9999 b/metadata/md5-cache/media-sound/mixxx-2.3.9999
index 76185c9d0ef7..52fc7c6a68c9 100644
--- a/metadata/md5-cache/media-sound/mixxx-2.3.9999
+++ b/metadata/md5-cache/media-sound/mixxx-2.3.9999
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) wavpack? ( media-sound/wavpack ) dev-qt/qtconcurrent:5
+DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] ) wavpack? ( media-sound/wavpack ) dev-qt/qtconcurrent:5
 DESCRIPTION=Advanced Digital DJ tool based on Qt
 EAPI=8
-HOMEPAGE=https://www.mixxx.org/
+HOMEPAGE=https://mixxx.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake xdg udev git-r3
 IUSE=aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack l10n_ca l10n_cs l10n_de l10n_en l10n_es l10n_fi l10n_fr l10n_gl l10n_id l10n_it l10n_ja l10n_kn l10n_nl l10n_pl l10n_pt l10n_ro l10n_ru l10n_sl l10n_sq l10n_sr l10n_tr l10n_zh-CN l10n_zh-TW
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) wavpack? ( media-sound/wavpack )
+RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=l10n_ca? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ca.pdf ) l10n_cs? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-cs.pdf ) l10n_de? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-de.pdf ) l10n_en? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf ) l10n_es? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-es.pdf ) l10n_fi? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fi.pdf ) l10n_fr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fr.pdf ) l10n_gl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-gl.pdf ) l10n_id? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-id.pdf ) l10n_it? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-it.pdf ) l10n_ja? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ja-JP.pdf ) l10n_kn? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-kn.pdf ) l10n_nl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-nl.pdf ) l10n_pl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pl.pdf ) l10n_pt? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pt.pdf ) l10n_ro? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ro.pdf ) l10n_ru? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ru.pdf ) l10n_sl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sl.pdf ) l10n_sq? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sq.pdf ) l10n_sr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sr.pdf ) l10n_tr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-tr.pdf ) l10n_zh-CN? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-CN.pdf ) l10n_zh-TW? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-TW.pdf ) https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7c3f9a26f468c57002dbd6ae27a7613d
+_md5_=11d50a4d0900900e7131832008b04934
diff --git a/metadata/md5-cache/media-sound/mixxx-9999 b/metadata/md5-cache/media-sound/mixxx-9999
index 10d70c5521f0..47a9669aa070 100644
--- a/metadata/md5-cache/media-sound/mixxx-9999
+++ b/metadata/md5-cache/media-sound/mixxx-9999
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) shout? ( >=media-libs/libshout-2.4.5 ) wavpack? ( media-sound/wavpack ) dev-cpp/ms-gsl
+DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] ) shout? ( >=media-libs/libshout-2.4.5 ) wavpack? ( media-sound/wavpack ) dev-cpp/ms-gsl
 DESCRIPTION=Advanced Digital DJ tool based on Qt
 EAPI=8
-HOMEPAGE=https://www.mixxx.org/
+HOMEPAGE=https://mixxx.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake xdg udev git-r3
 IUSE=aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) shout? ( >=media-libs/libshout-2.4.5 ) wavpack? ( media-sound/wavpack )
+RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2 ) ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] ) shout? ( >=media-libs/libshout-2.4.5 ) wavpack? ( media-sound/wavpack )
 SLOT=0
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3529436429eb28c2dc44085687aeca96
+_md5_=d40509a9740b86df0752c3518f0abe40
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 62a1ed1196d8..483dd90a3c11 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/qmplay2-22.10.23 b/metadata/md5-cache/media-video/qmplay2-22.10.23
deleted file mode 100644
index 20df68b7a864..000000000000
--- a/metadata/md5-cache/media-video/qmplay2-22.10.23
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-DESCRIPTION=A Qt-based video player, which can play most formats and codecs
-EAPI=8
-HOMEPAGE=https://github.com/zaps166/QMPlay2
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
-IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
-REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
-SLOT=0
-SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/22.10.23/QMPlay2-src-22.10.23.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e3a82b149d042a07ec52e4f8740173f3
diff --git a/metadata/md5-cache/media-video/qmplay2-23.02.05 b/metadata/md5-cache/media-video/qmplay2-23.02.05-r1
index 8b5a784e07e0..4d6e7f4891be 100644
--- a/metadata/md5-cache/media-video/qmplay2-23.02.05
+++ b/metadata/md5-cache/media-video/qmplay2-23.02.05-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 DESCRIPTION=A Qt-based video player, which can play most formats and codecs
 EAPI=8
 HOMEPAGE=https://github.com/zaps166/QMPlay2
@@ -9,9 +9,9 @@ INHERIT=cmake xdg
 IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
 SLOT=0
 SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/23.02.05/QMPlay2-src-23.02.05.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a502612ad882f591c4b6c42ae9102d6c
+_md5_=12d9b07fb6e621cf46b24ef77c8070cc
diff --git a/metadata/md5-cache/media-video/qmplay2-9999 b/metadata/md5-cache/media-video/qmplay2-9999
index de581d64d25e..a4daae1c1d25 100644
--- a/metadata/md5-cache/media-video/qmplay2-9999
+++ b/metadata/md5-cache/media-video/qmplay2-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 DESCRIPTION=A Qt-based video player, which can play most formats and codecs
 EAPI=8
 HOMEPAGE=https://github.com/zaps166/QMPlay2
@@ -9,8 +9,8 @@ INHERIT=cmake xdg git-r3
 IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
 LICENSE=LGPL-3
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
 SLOT=0
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=314ce6d63b9e26bb1178b532c9d29186
+_md5_=a44d7f98df9c9fbdc74b700f70d45915
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 652b2ce93ec5..ea5f21efa053 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3-r1 b/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3-r1
new file mode 100644
index 000000000000..d2ea9144ce4d
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=RTSP conntrack module for Netfilter
+EAPI=8
+HOMEPAGE=http://mike.it-loops.com/rtsp
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=dist-kernel modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0
+SRC_URI=https://github.com/maru-sama/rtsp-linux/archive/5.3.tar.gz -> rtsp-conntrack-5.3.tar.gz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	11c01a51c0ea7919b41d38e3c0d5b5cf	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=2d2e632d66123d09011a9235ce964f12
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.24-r1 b/metadata/md5-cache/net-firewall/xtables-addons-3.24-r1
index 2cceb462df8d..2690e711819a 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.24-r1
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.24-r1
@@ -12,5 +12,5 @@ LICENSE=GPL-2+
 RDEPEND=net-firewall/iptables:= xtables_addons_asn? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://inai.de/files/xtables-addons/xtables-addons-3.24.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	b5f765ee7d693eb6478df913936788fc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	11c01a51c0ea7919b41d38e3c0d5b5cf	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=cae1511e40ef0ebac416dd6d7d4faf5a
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index a7a08ebba244..68d45ee29875 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/psi-9999 b/metadata/md5-cache/net-im/psi-9999
index f0a2ef4a1973..abc3a92efcf4 100644
--- a/metadata/md5-cache/net-im/psi-9999
+++ b/metadata/md5-cache/net-im/psi-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) extras? ( >=sys-devel/qconf-2.4 ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-crypt/qca:2[ssl] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 net-dns/libidn:0 net-libs/http-parser:= net-libs/usrsctp sys-libs/zlib[minizip] x11-libs/libX11 x11-libs/libxcb aspell? ( app-text/aspell ) dbus? ( dev-qt/qtdbus:5 ) enchant? ( app-text/enchant:2 ) hunspell? ( app-text/hunspell:= ) keyring? ( dev-libs/qtkeychain:= ) webengine? ( dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] net-libs/http-parser ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-crypt/qca:2[ssl] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 net-dns/libidn:0 net-libs/http-parser:= net-libs/usrsctp sys-libs/zlib[minizip] x11-libs/libX11 x11-libs/libxcb aspell? ( app-text/aspell ) dbus? ( dev-qt/qtdbus:5 ) enchant? ( app-text/enchant:2 ) hunspell? ( app-text/hunspell:= ) keyring? ( dev-libs/qtkeychain:=[qt5(+)] ) webengine? ( dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] net-libs/http-parser ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Qt XMPP client
 EAPI=7
 HOMEPAGE=https://psi-im.org
@@ -8,9 +8,9 @@ INHERIT=git-r3 cmake plocale qmake-utils xdg
 IUSE=aspell crypt dbus debug doc enchant extras +hunspell iconsets keyring webengine xscreensaver
 LICENSE=GPL-2 iconsets? ( all-rights-reserved )
 PROPERTIES=live
-RDEPEND=app-crypt/qca:2[ssl] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 net-dns/libidn:0 net-libs/http-parser:= net-libs/usrsctp sys-libs/zlib[minizip] x11-libs/libX11 x11-libs/libxcb aspell? ( app-text/aspell ) dbus? ( dev-qt/qtdbus:5 ) enchant? ( app-text/enchant:2 ) hunspell? ( app-text/hunspell:= ) keyring? ( dev-libs/qtkeychain:= ) webengine? ( dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] net-libs/http-parser ) dev-qt/qtimageformats crypt? ( app-crypt/qca[gpg] )
+RDEPEND=app-crypt/qca:2[ssl] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 net-dns/libidn:0 net-libs/http-parser:= net-libs/usrsctp sys-libs/zlib[minizip] x11-libs/libX11 x11-libs/libxcb aspell? ( app-text/aspell ) dbus? ( dev-qt/qtdbus:5 ) enchant? ( app-text/enchant:2 ) hunspell? ( app-text/hunspell:= ) keyring? ( dev-libs/qtkeychain:=[qt5(+)] ) webengine? ( dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] net-libs/http-parser ) dev-qt/qtimageformats crypt? ( app-crypt/qca[gpg] )
 REQUIRED_USE=?? ( aspell enchant hunspell ) iconsets? ( extras )
 RESTRICT=test iconsets? ( bindist )
 SLOT=0
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plocale	950fbaec7deeba41b5bcc0572cca99b9	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3c2267b5d9ea2bb9dd88c8089238c6ec
+_md5_=c2cb1237cfd39be3335777eac441c3e2
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 8bc23f35b24f..6d890c893875 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/openldap-2.5.14 b/metadata/md5-cache/net-nds/openldap-2.5.14
index fc737d9db69b..baebbe475fa6 100644
--- a/metadata/md5-cache/net-nds/openldap-2.5.14
+++ b/metadata/md5-cache/net-nds/openldap-2.5.14
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.5
 SRC_URI=https://gitlab.com/openldap/openldap/-/archive/OPENLDAP_REL_ENG_2_5_14/openldap-OPENLDAP_REL_ENG_2_5_14.tar.bz2 mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	ssl-cert	33f6c352c602e87ceda767a86f3b7131	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=dcc45fcd8be6bab30c0935aa6d99208e
+_md5_=253e82c3998e056a7ba57b983d5edb8e
diff --git a/metadata/md5-cache/net-nds/openldap-2.6.4-r1 b/metadata/md5-cache/net-nds/openldap-2.6.4-r1
index 32a4419a638d..c0a21da6c456 100644
--- a/metadata/md5-cache/net-nds/openldap-2.6.4-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.6.4-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.6
 SRC_URI=https://gitlab.com/openldap/openldap/-/archive/OPENLDAP_REL_ENG_2_6_4/openldap-OPENLDAP_REL_ENG_2_6_4.tar.bz2 mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	ssl-cert	33f6c352c602e87ceda767a86f3b7131	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1ffcfe3f80fbae7b58eee2db46c244f7
+_md5_=1f61e841636f6bea0aa63dc497b6ffd4
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index a76c4d4fe54d..d8a8a62e5f78 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.20.2 b/metadata/md5-cache/net-vpn/openfortivpn-1.20.2
index 67a15ec14c4f..7e4f1228037f 100644
--- a/metadata/md5-cache/net-vpn/openfortivpn-1.20.2
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.20.2
@@ -5,10 +5,10 @@ DESCRIPTION=Fortinet compatible VPN client
 EAPI=8
 HOMEPAGE=https://github.com/adrienverge/openfortivpn
 INHERIT=autotools linux-info
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3-with-openssl-exception openssl
 RDEPEND=dev-libs/openssl:0= <net-dialup/ppp-2.5.0
 SLOT=0
 SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.20.2.tar.gz -> openfortivpn-1.20.2.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1fd72f8ffc8e50b7d8ad52e2f7747279
+_md5_=188014446bef9604130809dcf31f0f59
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.20.3 b/metadata/md5-cache/net-vpn/openfortivpn-1.20.3
new file mode 100644
index 000000000000..10ed8339e21b
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.20.3
@@ -0,0 +1,14 @@
+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=install prepare setup
+DEPEND=dev-libs/openssl:= <net-dialup/ppp-2.5.0
+DESCRIPTION=Fortinet compatible VPN client
+EAPI=8
+HOMEPAGE=https://github.com/adrienverge/openfortivpn
+INHERIT=autotools linux-info
+KEYWORDS=~amd64
+LICENSE=GPL-3-with-openssl-exception openssl
+RDEPEND=dev-libs/openssl:= <net-dialup/ppp-2.5.0
+SLOT=0
+SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.20.3.tar.gz -> openfortivpn-1.20.3.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=9b4161875999f0e4c9a82c5da4961898
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 78c57a2f4e91..ca7e7645d891 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/wxmaxima-23.04.1 b/metadata/md5-cache/sci-mathematics/wxmaxima-23.04.1
index 0172f3f02b90..255d947eb888 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-23.04.1
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-23.04.1
@@ -7,11 +7,11 @@ HOMEPAGE=https://wxmaxima-developers.github.io/wxmaxima/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake plocale wxwidgets xdg
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3[webkit] media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-23.04.1.tar.gz -> wxmaxima-23.04.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e3b14959be4f2f73feba1cab127ff20b
+_md5_=8d1c959d2e78d36f9c4c8465ad27ad5f
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index cd8c39a22b9b..09ae8de1260d 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/goawk-1.23.0 b/metadata/md5-cache/sys-apps/goawk-1.23.0
deleted file mode 100644
index a37da4a2aad6..000000000000
--- a/metadata/md5-cache/sys-apps/goawk-1.23.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=POSIX-compliant AWK interpreter written in Go, with CSV support
-EAPI=8
-HOMEPAGE=https://github.com/benhoyt/goawk
-INHERIT=go-module
-KEYWORDS=~amd64 ~arm64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/benhoyt/goawk/archive/v1.23.0.tar.gz -> goawk-1.23.0.tar.gz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fa0bee9e103ee273b903e5e2f7384c87
diff --git a/metadata/md5-cache/sys-apps/goawk-1.22.0 b/metadata/md5-cache/sys-apps/goawk-1.23.1
index f95ace9143d7..7a366b505a5b 100644
--- a/metadata/md5-cache/sys-apps/goawk-1.22.0
+++ b/metadata/md5-cache/sys-apps/goawk-1.23.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=MIT
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/benhoyt/goawk/archive/v1.22.0.tar.gz -> goawk-1.22.0.tar.gz
+SRC_URI=https://github.com/benhoyt/goawk/archive/v1.23.1.tar.gz -> goawk-1.23.1.tar.gz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=fa0bee9e103ee273b903e5e2f7384c87
diff --git a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200120-r1 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200120-r1
deleted file mode 100644
index 174d2c7a4e0e..000000000000
--- a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200120-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DESCRIPTION=An (often faster than gawk) awk-interpreter
-EAPI=7
-HOMEPAGE=https://invisible-island.net/mawk/mawk.html
-INHERIT=toolchain-funcs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://invisible-mirror.net/archives/mawk/mawk-1.3.4-20200120.tgz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=af8dfef7e3879b4dfb96a516353e8341
diff --git a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20230203 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20230525
index d58fd6fda904..561e6c807fc7 100644
--- a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20230203
+++ b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20230525
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://invisible-island.net/mawk/mawk.html
 INHERIT=toolchain-funcs verify-sig
 IUSE=verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=https://invisible-mirror.net/archives/mawk/mawk-1.3.4-20230203.tgz verify-sig? ( https://invisible-island.net/archives/mawk/mawk-1.3.4-20230203.tgz.asc )
+SRC_URI=https://invisible-mirror.net/archives/mawk/mawk-1.3.4-20230525.tgz verify-sig? ( https://invisible-island.net/archives/mawk/mawk-1.3.4-20230525.tgz.asc )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=458208d43963ae5769e0fe9cd09d02a7
+_md5_=c3cde03dce599cb89a4e34db78b46ba3
diff --git a/metadata/md5-cache/sys-apps/moar-1.14.0 b/metadata/md5-cache/sys-apps/moar-1.15.1
index 49319cc76e4e..867824804e7a 100644
--- a/metadata/md5-cache/sys-apps/moar-1.14.0
+++ b/metadata/md5-cache/sys-apps/moar-1.15.1
@@ -9,6 +9,6 @@ LICENSE=BSD-2 BSD MIT
 RDEPEND=!dev-lang/moarvm
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/walles/moar/archive/refs/tags/v1.14.0.tar.gz -> moar-1.14.0.tar.gz https://dev.gentoo.org/~sam/distfiles/sys-apps/moar/moar-1.14.0-deps.tar.xz
+SRC_URI=https://github.com/walles/moar/archive/refs/tags/v1.15.1.tar.gz -> moar-1.15.1.tar.gz https://dev.gentoo.org/~sam/distfiles/sys-apps/moar/moar-1.15.1-deps.tar.xz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=d99dedd6d98e24288649d7350a43e88f
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 17dddc02885b..502e09165f2e 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/reflex-20230523 b/metadata/md5-cache/sys-devel/reflex-20230523
new file mode 100644
index 000000000000..bbd17be49a03
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/reflex-20230523
@@ -0,0 +1,13 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure unpack
+DESCRIPTION=This is a variant of the flex fast lexical scanner
+EAPI=8
+HOMEPAGE=https://invisible-island.net/reflex/
+INHERIT=verify-sig
+IUSE=verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=FLEX
+SLOT=0
+SRC_URI=https://invisible-island.net/archives/reflex/reflex-20230523.tgz verify-sig? ( https://invisible-island.net/archives/reflex/reflex-20230523.tgz.asc )
+_eclasses_=verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=34717d9539d609c038c35afaee6e2a9a
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 6ae2b2003ceb..044f2529488c 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/vhba-20211218-r2 b/metadata/md5-cache/sys-fs/vhba-20211218-r2
index 97ed503749f5..5025549aa44a 100644
--- a/metadata/md5-cache/sys-fs/vhba-20211218-r2
+++ b/metadata/md5-cache/sys-fs/vhba-20211218-r2
@@ -12,5 +12,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/udev sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/vhba-module/vhba-module-20211218.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	b5f765ee7d693eb6478df913936788fc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	11c01a51c0ea7919b41d38e3c0d5b5cf	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=8156bb6d8d0085f15a154153d1ea1d70
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.11-r1 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.11-r1
index 8d41f02bd9eb..4825f67721dc 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.11-r1
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.11-r1
@@ -14,5 +14,5 @@ RDEPEND=dist-kernel-cap? ( dist-kernel? ( <virtual/dist-kernel-6.3 ) ) sys-apps/
 RESTRICT=test
 SLOT=0/2.1.11-r1
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.11/zfs-2.1.11.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.11/zfs-2.1.11.tar.gz.asc )
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	dist-kernel-utils	557a93bd51735200952a735894f6628e	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	b5f765ee7d693eb6478df913936788fc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	dist-kernel-utils	557a93bd51735200952a735894f6628e	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	11c01a51c0ea7919b41d38e3c0d5b5cf	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=966847c203c58ce10458fd1d723cd44e
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index 152b0d859c77..002238743fb9 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -13,5 +13,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 RESTRICT=test
 SLOT=0/9999
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	dist-kernel-utils	557a93bd51735200952a735894f6628e	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	b5f765ee7d693eb6478df913936788fc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	dist-kernel-utils	557a93bd51735200952a735894f6628e	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	11c01a51c0ea7919b41d38e3c0d5b5cf	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=f88d0eb3f8504fddd6d616c09cb5e94c
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index b31b92912921..be4b155b40e7 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.114 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.114
new file mode 100644
index 000000000000..42cd4b11a81e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.114
@@ -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.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel 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.114
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.114 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.114
+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-120.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-120.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=9de7b29d1e4407b307182ed95a3d9bf0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.31 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.31
new file mode 100644
index 000000000000..ad51eef15b51
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.31
@@ -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.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.31
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.1.31 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.31
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-36.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-36.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=fd499f3354bc25c94813a3872010ca13
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.3.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.3.5
new file mode 100644
index 000000000000..ad4f65701ea6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.3.5
@@ -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.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel 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.3.5
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.3.5 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.3.5
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.3-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.3-8.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.3.1-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.3.1-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.3.1-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.3.1-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=52d80b933d0abd24a9d5d1f888aada90
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.114 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.114
new file mode 100644
index 000000000000..7b9153928cd1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.114
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.114
+RDEPEND=!sys-kernel/gentoo-kernel:5.15.114 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.114
+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-120.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-120.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.114-1.gpkg.tar -> gentoo-kernel-5.15.114-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.114-1.gpkg.tar -> gentoo-kernel-5.15.114-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.114-1.gpkg.tar -> gentoo-kernel-5.15.114-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.114-1.gpkg.tar -> gentoo-kernel-5.15.114-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=3a8ae6be2f70d60acd9626d82f8147e7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.31 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.31
new file mode 100644
index 000000000000..f964a188f5b7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.31
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.31
+RDEPEND=!sys-kernel/gentoo-kernel:6.1.31 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.31
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-36.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-36.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.31-1.gpkg.tar -> gentoo-kernel-6.1.31-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.31-1.gpkg.tar -> gentoo-kernel-6.1.31-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.31-1.gpkg.tar -> gentoo-kernel-6.1.31-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.31-1.gpkg.tar -> gentoo-kernel-6.1.31-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=cad2b30138d88863a6bbc530b2441b9f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.3.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.3.5
new file mode 100644
index 000000000000..fda8e6b3ae33
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.3.5
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.3.5
+RDEPEND=!sys-kernel/gentoo-kernel:6.3.5 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.3.5
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.3-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.3-8.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.5-1.gpkg.tar -> gentoo-kernel-6.3.5-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.5-1.gpkg.tar -> gentoo-kernel-6.3.5-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.5-1.gpkg.tar -> gentoo-kernel-6.3.5-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.5-1.gpkg.tar -> gentoo-kernel-6.3.5-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=68f99116fb8734b0fcefafa3774e7199
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.316 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.316
index ab88f82a1fa6..92997ea0ee37 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.316
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.316
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.14.316
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-327.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-327.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-327.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-327.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-327.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-327.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=24871fcf372fbb712a22b103c1719521
+_md5_=0938e02568f87afd8c5aa303c9327210
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.284 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.284
index d97f5478ac38..928853f1caa4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.284
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.284
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.19.284
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-285.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-285.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-285.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-285.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-285.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-285.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cf5b198e09bcc9015448606b6fb4ef6a
+_md5_=149a640d9f4f9eba8e2139624e9a0d45
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.181 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.181
index 1534d7a6fe00..e20d7d886696 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.181
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.181
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.10.181
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-191.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-191.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-191.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-191.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-191.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-191.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b2614f15984f776fe674ab2754fab18b
+_md5_=aa1cf921c0da71bbc3cf3a0a792441ec
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.114 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.114
index 5ea043668270..8556f2f6d855 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.114
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.114
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.15.114
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-120.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-120.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-120.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-120.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-120.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-120.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=da35958c036714fb84c3da8dc5149d7e
+_md5_=05e7525cdf3ee318b671b39bf34a6ee2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.244 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.244
index 8c27dd0653dc..5ebc17c7852b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.244
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.244
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.4.244
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-251.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-251.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-251.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-251.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-251.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-251.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=750d8f237b6ef9d352c16f47871cbe77
+_md5_=b3d0e07e261cd07bc653912cb1b76a8c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.31 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.31
index 035e332cf32f..3f47cf2dd884 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.31
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.31
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=6.1.31
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-36.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-36.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-36.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-36.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-36.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-36.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=641dde3220c042b4e5d09f87ae393162
+_md5_=4d25ab37721787982ef6f254eca8b068
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.114 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.114
new file mode 100644
index 000000000000..ef5e19ae1045
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.114
@@ -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.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel 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.114
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.114
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.114.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.114.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=2eac001ceafd53f76d270f933dce1217
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.31 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.31
new file mode 100644
index 000000000000..4c0bad12f180
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.31
@@ -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.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.31
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.31
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.31.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.31.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=6af3201a419530fc1a9351b0f433c39c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.3.5 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.3.5
new file mode 100644
index 000000000000..62b0213f63ff
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.3.5
@@ -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.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel 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.3.5
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.3.5
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.5.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.5.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.3.1-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.3.1-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.3.1-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.3.1-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=aa8a6e1653e357261e5beaf4601b97a1
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 0a367f5e88e4..88f8e2c3190f 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.4_p20230527 b/metadata/md5-cache/sys-libs/ncurses-6.4_p20230527
new file mode 100644
index 000000000000..77dc378f47bb
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ncurses-6.4_p20230527
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst test unpack
+DEPEND=gpm? ( sys-libs/gpm[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=Console display library
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/
+INHERIT=flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript verify-sig
+IUSE=ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=gpm? ( sys-libs/gpm[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/ncurses-5.9-r4:5 !<sys-libs/slang-2.3.2_pre23 !<x11-terms/rxvt-unicode-9.06-r3 !<x11-terms/st-0.6-r1
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=mirror://gnu/ncurses/ncurses-6.4.tar.gz https://invisible-island.net/archives/ncurses/ncurses-6.4.tar.gz https://invisible-mirror.net/archives/ncurses/ncurses-6.4.tar.gz verify-sig? ( mirror://gnu/ncurses/ncurses-6.4.tar.gz.sig ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230107.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230107.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230107.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230107.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230107.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230107.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230114.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230114.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230114.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230114.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230114.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230114.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230121.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230121.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230121.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230121.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230121.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230121.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230128.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230128.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230128.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230128.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230128.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230128.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230211.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230211.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230211.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230211.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230211.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230211.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230218.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230218.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230218.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230218.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230218.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230218.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230225.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230225.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230225.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230225.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230225.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230225.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230311.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230311.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230311.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230311.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230311.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230311.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230401.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230401.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230401.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230401.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230401.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230401.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230408.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230408.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230408.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230408.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230408.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230408.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230415.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230415.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230415.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230415.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230415.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230415.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230418.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230418.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230418.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230418.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230418.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230418.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230423.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230423.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230423.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230423.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230423.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230423.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230424.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230424.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230424.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230424.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230424.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230424.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230429.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230429.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230429.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230429.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230429.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230429.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230506.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230506.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230506.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230506.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230506.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230506.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230514.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230514.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230514.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230514.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230514.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230514.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230520.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230520.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230520.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230520.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230520.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230520.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230527.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230527.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230527.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230527.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230527.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230527.patch.gz.asc ) https://dev.gentoo.org/~sam/distfiles/sys-libs/ncurses/ncurses-6.4_p20230527-patches.tar.xz
+_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=35674f79575f26052ffe0836822d41a1
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 61314a1acdc6..8ef3af223414 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/atop-2.9.0-r1 b/metadata/md5-cache/sys-process/atop-2.9.0-r1
index 949dbd0f19de..59b6e0c4d4e7 100644
--- a/metadata/md5-cache/sys-process/atop-2.9.0-r1
+++ b/metadata/md5-cache/sys-process/atop-2.9.0-r1
@@ -12,5 +12,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:= sys-libs/zlib >=sys-process/acct-6.6.4-r1 modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Atoptool/atop/archive/v2.9.0.tar.gz -> atop-2.9.0.tar.gz modules? ( https://www.atoptool.nl/download/netatop-3.1.tar.gz )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	b5f765ee7d693eb6478df913936788fc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	11c01a51c0ea7919b41d38e3c0d5b5cf	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=b6df5d42b3fe049c6134f1586376f71b
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index bb17e31bb827..221973897f8b 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.114 b/metadata/md5-cache/virtual/dist-kernel-5.15.114
new file mode 100644
index 000000000000..0ed81002a9dd
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.15.114
@@ -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.114 ~sys-kernel/gentoo-kernel-bin-5.15.114 ~sys-kernel/vanilla-kernel-5.15.114 )
+SLOT=0/5.15.114
+_md5_=2b14c705dcd61ca0cb392a256fbcb273
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.1.31 b/metadata/md5-cache/virtual/dist-kernel-6.1.31
new file mode 100644
index 000000000000..b3c5ad60746b
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.1.31
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.1.31 ~sys-kernel/gentoo-kernel-bin-6.1.31 ~sys-kernel/vanilla-kernel-6.1.31 )
+SLOT=0/6.1.31
+_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.3.5 b/metadata/md5-cache/virtual/dist-kernel-6.3.5
new file mode 100644
index 000000000000..cd97182edd50
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.3.5
@@ -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.3.5 ~sys-kernel/gentoo-kernel-bin-6.3.5 ~sys-kernel/vanilla-kernel-6.3.5 )
+SLOT=0/6.3.5
+_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 3e0b36862bca..7fc09af091e4 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/lighttpd-1.4.71 b/metadata/md5-cache/www-servers/lighttpd-1.4.71
new file mode 100644
index 000000000000..2baea4d85b12
--- /dev/null
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.71
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig test? ( virtual/perl-Test-Harness ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=acct-group/lighttpd acct-user/lighttpd virtual/libcrypt:= brotli? ( app-arch/brotli:= ) dbi? ( dev-db/libdbi mysql? ( dev-db/libdbi-drivers[mysql] ) postgres? ( dev-db/libdbi-drivers[postgres] ) sqlite? ( dev-db/libdbi-drivers[sqlite] ) ) gnutls? ( net-libs/gnutls ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2.1.26:= ) 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 ) ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss ) pcre? ( dev-libs/libpcre2 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.7:= ) system-xxhash? ( dev-libs/xxhash ) unwind? ( sys-libs/libunwind:= ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) zstd? ( app-arch/zstd:= ) elibc_musl? ( sys-libs/queue-standalone )
+DESCRIPTION=Lightweight high-performance web server
+EAPI=8
+HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
+INHERIT=lua-single meson readme.gentoo-r1 systemd tmpfiles
+IUSE=+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite +system-xxhash test unwind webdav xattr +zlib zstd lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=acct-group/lighttpd acct-user/lighttpd virtual/libcrypt:= brotli? ( app-arch/brotli:= ) dbi? ( dev-db/libdbi mysql? ( dev-db/libdbi-drivers[mysql] ) postgres? ( dev-db/libdbi-drivers[postgres] ) sqlite? ( dev-db/libdbi-drivers[sqlite] ) ) gnutls? ( net-libs/gnutls ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2.1.26:= ) 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 ) ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss ) pcre? ( dev-libs/libpcre2 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.7:= ) system-xxhash? ( dev-libs/xxhash ) unwind? ( sys-libs/libunwind:= ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) zstd? ( app-arch/zstd:= ) selinux? ( sec-policy/selinux-apache ) virtual/tmpfiles
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) mysql? ( dbi ) postgres? ( dbi ) sqlite? ( dbi ) webdav? ( sqlite )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.71.tar.xz
+_eclasses_=lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	915ec7c25e08d7886558215e6809ca1e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=0e8c64591b4960425f16c0f76856bb3b
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index d078a8c6df33..595985205573 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-530.41.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-530.41.03
index a1913f0cf285..d5bdab314cce 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-530.41.03
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-530.41.03
@@ -13,5 +13,5 @@ RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistence
 REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/530
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/530.41.03/NVIDIA-Linux-x86_64-530.41.03.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/530.41.03/NVIDIA-Linux-aarch64-530.41.03.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-530.41.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-530.41.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-530.41.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-530.41.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-530.41.03.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-530.41.03.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	b5f765ee7d693eb6478df913936788fc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	11c01a51c0ea7919b41d38e3c0d5b5cf	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	83547b4df3e1ba5a6bf91a0837eaa664
 _md5_=2b52bc89df54fc312f529438fa41e2ad
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.43.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.43.02
index a439d011e4b8..727507ff0830 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.43.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.43.02
@@ -12,5 +12,5 @@ RDEPEND=acct-group/video sys-libs/glibc dev-libs/openssl:= || ( dev-libs/openssl
 REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/535
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/535.43.02/NVIDIA-Linux-x86_64-535.43.02.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/535.43.02/NVIDIA-Linux-aarch64-535.43.02.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-535.43.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-535.43.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-535.43.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-535.43.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-535.43.02.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-535.43.02.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	b5f765ee7d693eb6478df913936788fc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	11c01a51c0ea7919b41d38e3c0d5b5cf	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	83547b4df3e1ba5a6bf91a0837eaa664
 _md5_=18d21efd9a9efbbe08b45366007ed4b5
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 0b7272a755f6..498849910376 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/xterm-378 b/metadata/md5-cache/x11-terms/xterm-378
deleted file mode 100644
index 34013bbd1fb2..000000000000
--- a/metadata/md5-cache/x11-terms/xterm-378
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst postrm preinst unpack
-DEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto
-DESCRIPTION=Terminal Emulator for X Windows
-EAPI=8
-HOMEPAGE=https://invisible-island.net/xterm/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop flag-o-matic toolchain-funcs verify-sig xdg
-IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
-SLOT=0
-SRC_URI=https://invisible-island.net/archives/xterm/xterm-378.tgz verify-sig? ( https://invisible-island.net/archives/xterm/xterm-378.tgz.asc )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=51311bb5947e2f604a09f5e27ac1fd17
diff --git a/metadata/md5-cache/x11-terms/xterm-377-r1 b/metadata/md5-cache/x11-terms/xterm-381
index 1e5453c4bf69..91108abc7726 100644
--- a/metadata/md5-cache/x11-terms/xterm-377-r1
+++ b/metadata/md5-cache/x11-terms/xterm-381
@@ -7,10 +7,10 @@ HOMEPAGE=https://invisible-island.net/xterm/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop flag-o-matic toolchain-funcs verify-sig xdg
 IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
 SLOT=0
-SRC_URI=https://invisible-island.net/archives/xterm/xterm-377.tgz verify-sig? ( https://invisible-island.net/archives/xterm/xterm-377.tgz.asc )
+SRC_URI=https://invisible-island.net/archives/xterm/xterm-381.tgz verify-sig? ( https://invisible-island.net/archives/xterm/xterm-381.tgz.asc )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=51311bb5947e2f604a09f5e27ac1fd17
+_md5_=a2091f353e3c53fc242c2a380f823b8f
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 0b34fe8cf8a6..4f79f2e358ab 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-05-30T19:40:09Z
+TIMESTAMP 2023-05-31T01:40:08Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR2URlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR2pXhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klATHQ//RzLPm10VIHGWnbIL58N0VF/IXq9SEmCuMBKEvugSg+vbF4w3B/o3tNW3
-Y17cFTpe35BnObPug1mGg71DjDG5Fz67CsSCE3pM1hdFvt4XvMH6EJw/0cngB4P5
-r8T8KJyqNk55MXE+2U9Tiwp/uVhoLoqD7NuI8xs4e4EgueWyAV43gEJjk67ZQ/DJ
-GQanlFFZjlBsNuEvPHpyTekz5y+9jJH3+XoH53TrLG/0v7Rz462nX2bzA0Hch5dr
-qQkW09DhMH5i8nToBHmbxbbk+Vt3++XqMbi4i/9kqlF/oJPp1G66fgjjqPvzuoOG
-i4WeDK5oXMdC7ueygAOfoSxVcnvFyCmh+IuzyxP4mnL2AP0QCIKj+pBM9osLbsSt
-2WBra4FtvX39fXPJp05iWR7wkbdKeVWnaIuvoah/pJZ08+eom6DF+0Zi8Fh3fpFx
-xL1vvKDf1mOdYaXZd10sOFiw7/bvYDXqcoUr62SBFRRTF5EMwIPsIa7i5VGzirLY
-Rqs4mjhJlmI0Y63DeVIpBo+UCdLb02xBAsuV9b33BImGf6vZDOABFu8dHUgiKwSJ
-bRe9F5mK/JN0odeJ4YUQ/UfsjxB4NYikMQMsmpXoc/uqxWPLD58rBGtOxRiCAmo9
-RF3hfVZ/yCU+I3GHK6GF0fSBo6ZMTe7j8ng2ONBabloOdzCeOgw=
-=HpBv
+klBNexAAoijReGhHEUUvzYgd+gaM9NVEOB9xG9Ti2h0VZBAraN2Yd/TWRvPUwpb7
+w2rLFPAoFsW8IoLslCwI1MV32BSFAUquiSTLRh2DUSI5kPyvHoExg+GmFP67Fmx9
+qmPPpLVz6sbxaO95Yz9ZlC2XqSsGYaK4xLXsANMBKpnHS1MatDiMbpbAuXMmLZA2
+mx9ogHGL0hu9AH5LIBhlVPhEeDffRwPNwPRri3DkVwowp3giLPHTwAhtcreOG6Vd
+PJSbIl6fHyKdjCJkLT7jcQxlpf7EnYGbnBHLAFpBjfeQCKxXJ/CFJFieU9BpYUUA
+hIe2uwnj5DGWXuFGyPDGvFEzT8DyIg2k3eA1Vl6uEUC79m38y0Jh6MaW3ocAcsqr
+ycErW9aogHMV5JaZ6efc5g+TT/a8fOVFR/O4yhV9+FA29I/tsFQI2ESivdqFo3ze
+kwEhJ2GBtnTHiyuFAvuDAHWmHOLWV1Fb5/6ZnfirvNAbQH8UquRFhvaUlf0OGsd6
+NykU8mzVe9fnAHc/k+DREDlmDMCSNtz6XeaB9KzXPfr9hOI6WkE+bqo07w7y37Vp
+WvLAO4Ik2aR0MWh1GH0k2lBBN+T4Ed4fLRtkBSs4Y7BW9FhS6TAnNhtk0gd3YD1S
+QTWn2vaaX+jp5hUp/H7JTWpr5XWCEmWW0OwsYr1p8HpXtzrF3DE=
+=IXOX
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c207772130cf..f6490d2748b4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 30 May 2023 19:40:06 +0000
+Wed, 31 May 2023 01:40:06 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index b06ac1014001..92b98b65ed8d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue May 30 07:40:06 PM UTC 2023
+Wed May 31 01:40:05 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2fed5aa63e87..a246edfa4c2c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 30 May 2023 19:45:01 +0000
+Wed, 31 May 2023 01:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 9ff8cecf406c..3b9ca8291b19 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d670e14e0f618975e82c487a0fe55edcc941e0be 1685473211 2023-05-30T19:00:11+00:00
+095e98fefa5d6e9072a57f69cd6df53e079effcf 1685493816 2023-05-31T00:43:36+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 67b7a76efe53..501e71f2c90f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1685475601 Tue 30 May 2023 07:40:01 PM UTC
+1685497201 Wed 31 May 2023 01:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index c207772130cf..44c4ed606384 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 30 May 2023 19:40:06 +0000
+Wed, 31 May 2023 01:40:05 +0000
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 9948e21f0b5f..352e883afc58 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/rtsp-conntrack/Manifest b/net-firewall/rtsp-conntrack/Manifest
index afbb631616fb..62c1dcf59daf 100644
--- a/net-firewall/rtsp-conntrack/Manifest
+++ b/net-firewall/rtsp-conntrack/Manifest
@@ -1,3 +1,4 @@
 DIST rtsp-conntrack-5.3.tar.gz 12409 BLAKE2B 91bc82f404c3d5b32100684625f5fc9641d60df457c25b2bf93988bad7acd76fdc46e2e76d12dccf42eb61bd3f724752a974728a8b229bb59df6bec545e22151 SHA512 660cf212cb5802f0d9a02c45948d02729e686fe96e12d5e2294f5d9a588d872677d4f8ef39f4abac6ec3adb2ef5e1c884858e63275a84e1035d13c21537530ab
+EBUILD rtsp-conntrack-5.3-r1.ebuild 612 BLAKE2B 2ea9dbba4779e3896b651c03c6e2b208dcada0d45a9a77367170671b74cb60ee2925565a130be244706554d8fd19325731d78df9ff4f6ca8a4a59fbf2d82c63c SHA512 1c931d4332949c8c55750e40a0ac74b0ce8248c7ab939bd9650556fe58d5e61e84fa5bfd340ae8e61d626d05b848a1e57197835ba1f872baf343d1fdb5b6282f
 EBUILD rtsp-conntrack-5.3.ebuild 713 BLAKE2B 8559fc61f630373fe571805219ac94de0de02b6e9061b52f508f6e986da3a0c8b9c1a9c4bf688d4f5e2ad373825e72ccabeb99676afa97b66e868122694674f9 SHA512 edab69d7b9bf2cd6936831f12a6d2582a64b088a24573955eac978c6e255904570de16a052c3bab9f76df06fa68e83269060c5de8ec52c1e41ad1fd2f048885d
 MISC metadata.xml 253 BLAKE2B 6c0ff48fb0bc43e945ed68a2f4a5f067ecef5c84a32c013616037dd8de51b7ce80bbe6560800bb16c4c24e0318a592bbf943c4182b826d694780b46e0d8dd95e SHA512 8487052b487f4d0aea42dcddcbb32e1c55ed9da79074c12971b9f31f84acc3df9d67735e247a55057312840ffc7e1ea1fa54a5fd5bb1638ca20924cb04d60919
diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
new file mode 100644
index 000000000000..501856d25c2c
--- /dev/null
+++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-5.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+DESCRIPTION="RTSP conntrack module for Netfilter"
+HOMEPAGE="http://mike.it-loops.com/rtsp"
+SRC_URI="https://github.com/maru-sama/rtsp-linux/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/rtsp-linux-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CONFIG_CHECK="NF_CONNTRACK"
+
+src_compile() {
+	local modlist=(
+		nf_conntrack_rtsp=net/netfilter:::all
+		nf_nat_rtsp=net/ipv4/netfilter:::all
+	)
+	local modargs=( KERNELDIR="${KV_OUT_DIR}" )
+
+	linux-mod-r1_src_compile
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index be6153fa60a8..5765ae12d8fc 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 122f1d28f79d..5575d1dcf716 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,5 +1,5 @@
 DIST psi-1.5.tar.xz 2125104 BLAKE2B ee4114749b5958c61dccc45c2562d868f30a2f4765229c904c32d54d5730e2eaa9ab03e966fa5b83aba7e31d37fafb2b194c74a72f2404f3b51815bc525c5080 SHA512 c2e17dad346b5f7e8c97dc8959d99eaf4c30c1ba11c2d04b562af7b30482d5dbdc3a86508c4c29881ea0fc72db5a9d5fb4017768732cafee6a1d3025a39d8520
 DIST psi-l10n-1.5.tar.gz 3037979 BLAKE2B a1baef1b3c86c1b0a528d4395bd6aabf99e1ec4c077d5d0358d4fd9566fcc2d929f46688c3bb2f56ad1de840fa1699f33c211fa4c7597b66ba0842cccbfbc19c SHA512 d5ed8244fbaa9fdd9a40a14ef3660085c8c9c5a18352900fa8d947fad01aea5894c23d83dc16e8ebf9fe007905ecbb8eca7dfaa4e1cf0fa160af341967886cae
 EBUILD psi-1.5-r1.ebuild 2952 BLAKE2B c2b083341bd496f45f1136c2134c619cbfb8509643694c93c6ef63a7840d82c061267fa6cc21cb3dfa24480d730d99a29e5e080ec22f3a9a6ef1ea4567c047e0 SHA512 f5d0688af5062fa737feffc0c1b6b8e289f84973c708a9fee9ac68a2529c79050294c9f4e4d4234b65dc24a2bd753af05a074caf270924def7556eb1b4f98cbf
-EBUILD psi-9999.ebuild 4081 BLAKE2B 7fae46572504c46fdb57792f28bfdd0c156db7e6dd0dec38aee5cca416adeebe687fc2ea53aac6d0e632da7d995178b9b361fbdee208fced0933bb1ae5ab574e SHA512 2239414fc61760eb10262a319e899cae353ace4c47978316a02fcb5225918a49eb53d0618bea9ca35669e029a93217d2ce193da63ca8c536a64b0c1fd850b193
+EBUILD psi-9999.ebuild 4089 BLAKE2B d63c64e99bab0160598eb54caf0fbd21513b2bf7159f4ae888239b6b7205d0509656978d66dca40a692c566040392baf4ea5c9eb9c614252626fd1229da1b5f4 SHA512 6a12f6df183874f2a648ae265f521d838b4053cf87523f6f8524daac8785aa82a5e3b5838bfd44e734a2212735903e244a8c56f2ac8974d1f74f136342e8893d
 MISC metadata.xml 1444 BLAKE2B 72b4853aefa169b84d2edaaf7e03138b694a65645f53317796cbb68bf47136687ba2bf95727a9f021dc1bf88ce82d35f845fcd6c4bd3afc99f37b08f2da7a39e SHA512 e9ccbf8d367cd7872da7a96741f49f894c4292c05d733c60e151e809efd4cf2f39e2b8ac33b776570b77ab51ec3d5981f2635090228030d11c500626fca3dd8a
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index 4d4fbb81991e..08babf271fb0 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,7 +55,7 @@ DEPEND="
 	dbus? ( dev-qt/qtdbus:5 )
 	enchant? ( app-text/enchant:2 )
 	hunspell? ( app-text/hunspell:= )
-	keyring? ( dev-libs/qtkeychain:= )
+	keyring? ( dev-libs/qtkeychain:=[qt5(+)] )
 	webengine? (
 		dev-qt/qtwebchannel:5
 		dev-qt/qtwebengine:5[widgets]
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index b7cac934dc55..118cd91cc842 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 0f57465d8af3..55e02498e145 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -21,6 +21,7 @@ AUX openldap-2.6.1-system-mdb.patch 3679 BLAKE2B 9d9eb3dad904564cb453424743091c4
 AUX openldap-2.6.3-clang16.patch 5305 BLAKE2B 17260d51fba82c6f898c3fa2234a1038228b4085027a5bae086309b330f73f64e468a0016b486861c6f92c47f0d19f6ad9279068ffc0789600f3f8b6a6b2a4cf SHA512 776423d8cb2ee594792c97dd233c2e645daab028a40e4ce53a793f7199ff9879defb480250b2ccc4cbdada43473268b1f2990edb2b923987f8740b1a89011de5
 AUX openldap-2.6.3-slapd-conf 2059 BLAKE2B 3a9a5f22e450c37625f9718dd7467f721fb9046792499563652933221a5a6e56577a487fc6c3b7336ce45b5b5ca6cab82f073c7f61b7493d0f8323b296a84d8d SHA512 76ac3d22389d2da94dec8e712ec8073d9ba8be4df69ae2443883ce8b5b24757b0999f756a14ea57cb9566d8dbf94859a239efabe990febb347b794ba5070914d
 AUX openldap-2.6.4-clang16.patch 6953 BLAKE2B f347857252d857c4d1d54a0be3a1d68fc33c3ab78645c29161e212976cc9e28aa0d46812ac87a0aa23a55612c30fe49f72cfe9c31c71e6ba7ed84c80cc202018 SHA512 7c84fe7841440d00925fcf08ffb9e6ef10d5626aeb9d24b794e59281a15e5a6da0d4a9939db860011402b8aef8bc34bc6a9c643806098f2453da64fb62e74e70
+AUX openldap-2.6.4-libressl.patch 1590 BLAKE2B 3af178ceb4d6eb5792f4fe160d42b2fa2e662d8158ff98e93bd91fa0aaa73cca20277da907129e4c2124ae4e11021a0cbc53de1cd5308ef76c8e2ac26850a5df SHA512 674b08b5e4db1216b94d51b2c973f5cd8607c5a8aefcbdf5f25b6e210a071089ea9896deb59151e0cad5a73d002f88a75179f381a8b611473035a7207fe0bbee
 AUX slapd-2.6.1.service 300 BLAKE2B 2d634f91f7f7c69894641b145bb280a1df8ac05d23eae64100c21470065c1347c7a7c8ab72f93083ff1151fe69b75be2a5f93bdc1a9a0776582fecf2b8169039 SHA512 c3833a61be028ddb9de8dbc66cff5651cbc2ed88e1b414965476862b6a223b91d20b773c9323f0c62cd690ecb9b0e6314f3eb37b2255f89f20d303a5025323b5
 AUX slapd-confd-2.4.28-r1 1072 BLAKE2B 9d4cef3614164e09e27cc681a2d37c126da6666715b1f3092751d036b42c70bb73f3b6cc51defac791c3f8e63e250d8c9d946ef0b84bc8e38c1504ac7ea239a4 SHA512 7426c04ee689bcfb29a9a3956367c571eac6bc9620efda938591d09382a05527454458f7a25bdc2fa2ac920f93bae516121e085408ffefbe8ace0c7d8c5da315
 AUX slapd-confd-2.6.1 1060 BLAKE2B 06f5f0e7b87eb4962f8413f3f5ea21a29b4e8174c016420c5f8c00bf6deb1b27929175a5cb8dc2db272147154ddb6006a2cf7ac5ee07a9652e047f23603923c7 SHA512 79d332fec5e6539106ae9f457194c31ede99e682f6cac89512d76c0f5831a7cbd01de5ea05ced4228f581ba1327091eaf5209fdbeeddb5048c6ca6ba7c5b38d5
@@ -34,7 +35,7 @@ DIST openldap-OPENLDAP_REL_ENG_2_6_3.tar.gz 6244895 BLAKE2B 97792a1b368de44867b0
 DIST openldap-OPENLDAP_REL_ENG_2_6_4.tar.bz2 5043227 BLAKE2B 9bec77dbace0e52d1607d9ac13a77349e7d0b8876aa81fa635893638d00db58ec6bf8412f11fd266bba0440887be1aa21eb4a876122152f7f6de9fd8f75b6b4c SHA512 bff11bf1ae125bcabbd307f6c4e1c102a8df6f1091f84f5e7053fdbaa89ccd6aa0c86cc8dcce4fb9b6ffd853b5f8d3c933733f5713aeb4d6a9d77ab145293b48
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
 EBUILD openldap-2.4.59-r2.ebuild 29099 BLAKE2B be552c17227006e6ed8a6a6e210fa8fa9d7cbe63c0d83281f22e8e9332befab4a75a9c9ad1d8fc64d1ae5db9af93a24bd0fd1381b1cbca2270e9df1fff266ee1 SHA512 ab5fd9b46ea56d1ac9a2182b154242c0aeb6c1e42ba3ab44aac3c1d3435b94a1793f0320ae3ad86231eada66c74efda3c17938a6b6772f75508fbb5454512f49
-EBUILD openldap-2.5.14.ebuild 27621 BLAKE2B cbf4da0553ce397cf1f7efd4e0e8cc509bac087e6b2c5f9542a9fe51b3b1ed510a641b2629227aa1cb9df977a569eb43935467364fc3d48a86f533e0041e0d77 SHA512 80603b5bf598ecd9807972abf37e8eff480204274ac928ddefdb1662f8d0face536d038336cf81736944a7330df07905d176b712d86941b52d853ca34e30fe8f
+EBUILD openldap-2.5.14.ebuild 27671 BLAKE2B 66f145288cf882b17ed8f2e009370e48fd10c318a0b7f83927836a9ef74d0d758b6f5306f103c05a4d3c1c790658431ed6c0941ceabb7982666865994f346e76 SHA512 9878bcca761b1992ba3abdf72ea28fe34d5d8daaf148edf4365f15bf021497f74eed88fa37c7855c7f51429cbd9cc78be8e873c330bec829360b1fda1d1e07ef
 EBUILD openldap-2.6.3-r7.ebuild 26516 BLAKE2B 913f12c8b7fbd09840064ab26da36d48a2276b6d3c6a059fa4b45605e2a91709dfd1bd88e6573ee248a644ef633173bb353b1bc7e68755eedadb7b63af9326dd SHA512 ccfba2143d370db383f2b613408591e6864f6cdc05b859d0448b2bbee36f7c691cfdf39db6ea3c9132acab6136e1ee6dc4ca2a4b40105d60318578d01144aca0
-EBUILD openldap-2.6.4-r1.ebuild 27677 BLAKE2B 2567bd13b2a7c693f9ce4748428cc94042c99ae7c2d833b4fa3b4b7c47f84e94957ffe7fb8826d3919e40de831780edf1ab24e1d57a70ee12e29086319e3f9ae SHA512 17b1822094966cc0d0aa5968557773c3186f857a938a37e860d344e507feda0cda2f80482bd4e82864f3a4b34048c45f28ca586dcf597952d71f638c133338d2
+EBUILD openldap-2.6.4-r1.ebuild 27727 BLAKE2B 124f98e2dbd3827df4c66afaa3f10ac32d7b17e064531e290c760d83287ea554028ca1d89be590667d8ef5a6479388371286792f09096eacdd8a8d862456c154 SHA512 5f27c554ad0b9f02d13a9ea73c2c5da336e1074af3a1d61e139df5a5ec33bac505bb110bdc5494b6cd85aaa7dfaf0a6cb770e06b3d54a968bc7fe9954c64b7d1
 MISC metadata.xml 1316 BLAKE2B 0635123aab1a5bed9a0da918501fc5e43affe0fbd0f83f8a7e42b0292f4d5ce8231bb9d5c343c67c1011c916e78d475398c1a744b11d6f7e041ac0caed35900e SHA512 818c412cd17d1c49c7f68452fb9e2715f4441a5ff85a4e27dcb7f264c1b4d89cfa46c9d9e506b087376224cd9839e040fe63ea4149323be5c7777b54ef81716d
diff --git a/net-nds/openldap/files/openldap-2.6.4-libressl.patch b/net-nds/openldap/files/openldap-2.6.4-libressl.patch
new file mode 100644
index 000000000000..48a8a43e731a
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.6.4-libressl.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/903001
+https://bugs.openldap.org/show_bug.cgi?id=10039
+https://git.openldap.org/openldap/openldap/-/merge_requests/613
+https://git.openldap.org/openldap/openldap/-/commit/cb73e60a49f85bf5207b2fd0f557013be29ac072
+
+From cb73e60a49f85bf5207b2fd0f557013be29ac072 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 12 Apr 2023 12:55:46 -0700
+Subject: [PATCH] ITS#10039 Test for SSL_CTX_set_ciphersuites()
+
+When configuring OpenLDAP using --with-tls=openssl with LibreSSL the
+configure will fail to detect SSL_export_keyring_material_early() since
+LibreSSL doesn't support this function yet. However OpenLDAP doesn't
+actually use this function and only checks for it to ensure a modern
+OpenSSL API is used. This can be easily solved by checking for an
+equivalent modern OpenSSL function which both LibreSSL and OpenSSL both
+support such as SSL_CTX_set_ciphersuites(). Doing this allows the build
+and tests to succeed with modern LibreSSL versions. This was tested with
+LibreSSL >= 3.6.
+
+Bug: https://bugs.openldap.org/show_bug.cgi?id=10039
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2cf28ef346..c4e2a905e2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1243,7 +1243,7 @@ if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then
+ [#endif]])],
+ 					, [AC_MSG_FAILURE([OpenSSL 1.1.1 or newer required])])
+ 
+-		AC_CHECK_LIB(ssl, SSL_export_keying_material_early,
++		AC_CHECK_LIB(ssl, SSL_CTX_set_ciphersuites,
+ 			[have_openssl=yes], [have_openssl=no],
+ 			[-lcrypto])
+ 
diff --git a/net-nds/openldap/openldap-2.5.14.ebuild b/net-nds/openldap/openldap-2.5.14.ebuild
index b4b51dae0731..8b5c4628b810 100644
--- a/net-nds/openldap/openldap-2.5.14.ebuild
+++ b/net-nds/openldap/openldap-2.5.14.ebuild
@@ -143,6 +143,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.1-cloak.patch
 	"${FILESDIR}"/${PN}-2.6.1-flags.patch
 	"${FILESDIR}"/${PN}-2.6.4-clang16.patch
+	"${FILESDIR}"/${PN}-2.6.4-libressl.patch #903001
 )
 
 openldap_filecount() {
diff --git a/net-nds/openldap/openldap-2.6.4-r1.ebuild b/net-nds/openldap/openldap-2.6.4-r1.ebuild
index 463f6d0f7130..2747bc015832 100644
--- a/net-nds/openldap/openldap-2.6.4-r1.ebuild
+++ b/net-nds/openldap/openldap-2.6.4-r1.ebuild
@@ -144,6 +144,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.1-flags.patch
 	"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
 	"${FILESDIR}"/${PN}-2.6.4-clang16.patch
+	"${FILESDIR}"/${PN}-2.6.4-libressl.patch #903001
 )
 
 openldap_filecount() {
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 71535e02ba74..dff142d6cb51 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index 74586a91bb87..0ea1c47c2bce 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,6 +1,9 @@
+AUX openfortivpn-1.02.3-systemd_substitute_bin_and_sysconfig_dirs.patch 395 BLAKE2B 2d3360b5ed67228a63309ced0a0bccf0f23162a64c70ccd5364ab5d22e27217fbc5efab1a656cbadb83f7e029702e82c7ea647b0663823d5b06d4be369056b2e SHA512 e9a54af6737e3d97aa4e9e0cf974e5324fe22b8851261ce51fd49b97a53924d7d34bde2d1102ca2338930bd46739f765312187f43bba36317fe3ad0956fbe20f
 AUX systemd_substitute_bin_and_sysconfig_dirs.patch 490 BLAKE2B 071747a713f2b155959768d827b9b256842a6f587d23992a06be9ab7a701a6b4bc6b86b56fe0853f04ff81dc43f739d07f8cf60ba37c0bc9da2712a23d8a7f5a SHA512 511e8179a7f36a5e5bd2b4a07e62812aac8065b34b767992b823b5f4135addaf662f8a6061215898281dc128b8386b166f614307680416aaeba183db3ef5e2cb
 DIST openfortivpn-1.19.0.tar.gz 168962 BLAKE2B f2cff6f89a0662aca5911f6c3ef5953181383d4a66a41df83916c551338f07364436a174de39874cb654d6538955ac5d0a57a875facf2cc9b8c8a27a48df7fbf SHA512 4f4179178cbf2fc03ddebdfd4197c03a7108ecfa5216d5f11d80b2e3b840816f0a9a59714f58ecdcf966b76eb9b459e0bf78901940120ed1aa1cf69021385a53
 DIST openfortivpn-1.20.2.tar.gz 167680 BLAKE2B fec9ef5f38af6cf32283cb281d0871115c3ddface35bbbe5fb96cd132cf2f586bd21ddaf55424bc902ea3984472109ec40ee4fd16706d10cc1795b4d68216b1d SHA512 e3ad8e74f7ba05f61df464af8a6ff6ba41e0c73ad52fbb9eaa9485814788a4636800b91cdd88f88caecbc9e305b2759a628b02fbe2eaf12d33c7912bb3ce065b
+DIST openfortivpn-1.20.3.tar.gz 168568 BLAKE2B ef6132c354c0348d09584675d7fe0213bf67f78df6ef36434f7e7d5166e6a7ec2dd4352613271f208a72b7666a6259642156bd297485714f9bc53f09fd2dce17 SHA512 38a1b208c2cbba1b1f723d6f8a2e178970b8fd384dbb424c38654821d56fc1652bae27b7593cd6af3c08d7c9b8cf97550185905b690e6eae7222b31aea266f01
 EBUILD openfortivpn-1.19.0.ebuild 770 BLAKE2B 0f33dcaffec9c6bae497dcc1dbbf5df3aa351d710fee6cfc063ee0c54e050ee65b40241eca6a59fcb73be855219f72d0969cee7044796c036a90df6993956af9 SHA512 2ec2a815ce97035a001f8d515936e596da08bafc029b09cd1490aa4d05c7f80de43ec5e6e67a19d1ae9d296eda4f8ce86677ecfeeb18d5f5ecd8f339c99fe303
-EBUILD openfortivpn-1.20.2.ebuild 778 BLAKE2B c362d5cf4cd9ab9bf65f8cae934408e3e4e062ead844729fbfa957d5c6a7b39b3a8348f7dcc16a4c3790af8c33c8be591aa3a839b2a93c73ebe7e367e8d128e8 SHA512 f7059b4e5af2b16f0572626b2c8ad60587975995f3fb7a0c70a2e0a02dab78d3a3a21608608fd987a1828bfd64f0240a3a025a43ab4816f0ef1d75790cb84354
+EBUILD openfortivpn-1.20.2.ebuild 777 BLAKE2B d59b17999d0c02bb8d47962891f42f6b1985644d169cbd794c6c48f322a28d0e0496d1796cbe29fe4e7b09a080b0a5a0eef9c2f695860066b21abc891e1c3de3 SHA512 1b106073cb3b85fdfc017c33b97d260cc3750cf7bac14e4bfb78b2cf04b30cb6ae97b14084a30a4e8433b8d23dc960e0e2b888bec6e9fad7194616fe46759f09
+EBUILD openfortivpn-1.20.3.ebuild 790 BLAKE2B f576c361121becd83ddd19ef46450488d601e5509c34768747063ae710e7677c3406dd0bb7d0080ffa9d2d63fdde9923f8999e22b452f646f458e57a7a72216f SHA512 0b617b7443b8282183b2a209adc3f61a031a350f6834b41c54f9db51447f59abbe13183797c360e8c03935aa3bbf7caea9175e9a0467e4b78fc089f041b1b932
 MISC metadata.xml 257 BLAKE2B f87135c9aedf98ef822404eb43e8214ed1e6d3cfc71db8d1aece9c3f8c30fda5b63f1de77b8d8d98b9b6b8d671e164199bcd810a34fe71939b836b164261ec2e SHA512 7719a7bd4abd3115b6279c4446e87c0c552f8b7dadd7429cbd8844ee2fe2509b712287f2d2e5926d6711dbe21efaebb289d187ebc297be770bb538f8bf799d31
diff --git a/net-vpn/openfortivpn/files/openfortivpn-1.02.3-systemd_substitute_bin_and_sysconfig_dirs.patch b/net-vpn/openfortivpn/files/openfortivpn-1.02.3-systemd_substitute_bin_and_sysconfig_dirs.patch
new file mode 100644
index 000000000000..e9435f3054ed
--- /dev/null
+++ b/net-vpn/openfortivpn/files/openfortivpn-1.02.3-systemd_substitute_bin_and_sysconfig_dirs.patch
@@ -0,0 +1,11 @@
+--- a/lib/systemd/system/openfortivpn@.service.in
++++ b/lib/systemd/system/openfortivpn@.service.in
+@@ -9,7 +9,7 @@ Documentation=https://github.com/adrienverge/openfortivpn/wiki
+ [Service]
+ Type=notify
+ PrivateTmp=true
+-ExecStart=@BINDIR@/openfortivpn -c @SYSCONFDIR@/openfortivpn/%I.conf
++ExecStart=/usr/bin/openfortivpn -c /etc/openfortivpn/%I.conf
+ Restart=on-failure
+ OOMScoreAdjust=-100
+ 
diff --git a/net-vpn/openfortivpn/openfortivpn-1.20.2.ebuild b/net-vpn/openfortivpn/openfortivpn-1.20.2.ebuild
index 807cee798b75..ad5cd7e9678b 100644
--- a/net-vpn/openfortivpn/openfortivpn-1.20.2.ebuild
+++ b/net-vpn/openfortivpn/openfortivpn-1.20.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${
 
 LICENSE="GPL-3-with-openssl-exception openssl"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	dev-libs/openssl:0=
diff --git a/net-vpn/openfortivpn/openfortivpn-1.20.3.ebuild b/net-vpn/openfortivpn/openfortivpn-1.20.3.ebuild
new file mode 100644
index 000000000000..2a6111254e1e
--- /dev/null
+++ b/net-vpn/openfortivpn/openfortivpn-1.20.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info
+
+DESCRIPTION="Fortinet compatible VPN client"
+HOMEPAGE="https://github.com/adrienverge/openfortivpn"
+SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception openssl"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/openssl:=
+	<net-dialup/ppp-2.5.0
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~PPP ~PPP_ASYNC"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.02.3-systemd_substitute_bin_and_sysconfig_dirs.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	keepdir /etc/openfortivpn
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index de411564e8fb..cef5585ccad8 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 387bab35857d..6d79be1ecd96 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2023-05-30)
+# Removed from GStreamer 1.22.
+# Dropped upstream in https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9a4651e3879270292672f08a1f6ed2bffefc5aed.
+media-plugins/gst-plugins-libmms
+
 # Michał Górny <mgorny@gentoo.org> (2023-05-29)
 # Use the following snippet instead:
 #
diff --git a/profiles/package.mask b/profiles/package.mask
index a4a3089a2864..4fd6fe04cebf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -285,6 +285,7 @@ dev-java/resin-servlet-api
 # - sys-apps/openrc: https://github.com/OpenRC/openrc/issues/619
 =sys-libs/ncurses-6.4_p20230424
 =sys-libs/ncurses-6.4_p20230506
+=sys-libs/ncurses-6.4_p20230527
 
 # Eray Aslan <eras@gentoo.org> (2023-04-12)
 # Mask experimental software
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index ba35b5c19573..2382f0988047 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 1dc9b4352a42..d0c7423f736a 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -2,6 +2,6 @@ DIST wxmaxima-20.12.2.tar.gz 16262617 BLAKE2B 2f9f910f565158b2011f014d96747498c6
 DIST wxmaxima-23.04.1.tar.gz 22060726 BLAKE2B 77583c2461f7c32ac53ad2890d1e7d07a9fc2dd0caa07a1fcdd7c62d39ec63c50173542c74ce2d21093ce724d1777b76e7789f8a5363ff20406d52177c86a016 SHA512 9846c11cbeec8411170e0d55916187cc77274e2758726784bcb5540d55f712b5a557562de0c37dac0c7ef119d43570bd33efc33252fc5359627e527d668580a4
 DIST wxmaxima-23.05.1.tar.gz 16220058 BLAKE2B a680a562c92ac400c2e3e377e9f6aa387a259b3bfc9d533bba2f2fcc4c5abfca78c578935273932cbb4be6aa04c29c0316582472f212b0868cba2bfb0081234f SHA512 a36cf3207058065dbe68b8a75b7a97ab0ab827c9097f90a67af1c436703a22bff6978fbf173e0806e40d01270d97def1137de9af7d2501e96faca475d474c5af
 EBUILD wxmaxima-20.12.2.ebuild 1428 BLAKE2B 30e26a147fe84b328902bedb1ee7df68a6c27d203b9b6e900096d931091ce51cce41d22e45fe779bb4144949b1ebcf259fbd085cc4e2f992e495405c5176410d SHA512 823b28ad77dfa70536103b64735ec68cdefe38abeec760b15acb6904f7f8f97d6ace10eec836f0536ff576f7711b2d135a989072087ae67d133506a301920882
-EBUILD wxmaxima-23.04.1.ebuild 1901 BLAKE2B 7c6834bf45bd13bc889fd06a0b115f79b3d71f913f3a982af15eee7130900d152058c817e4908112d52d0f6a9dcb1eabc2a99987ea9e5306b8205fa68cf780e2 SHA512 651f5d701a5d346c744fd15d2094545b61615a3837d53e1b124be0507b4f5c29ad80bf98a1c1691645ec0caea851093cf7250ad9d9a94fc54bd722f15df874ec
+EBUILD wxmaxima-23.04.1.ebuild 1900 BLAKE2B 257f391dd07a43be496467e4a4d5b6db39fbe24e27d9707b2b1375bd94fac4fdf664a0314f183d939fdbff00d7f04f984aaff81e7b78dd55aaf9f77d39912875 SHA512 063dff121dc483c8ae247ff3c6d21685df83c66c797a7f6edcaeef4ed419fc9760a38a4d255f7db054af74d0607e40b0d3106dfc0072498be98af02e9ae69f0c
 EBUILD wxmaxima-23.05.1.ebuild 1901 BLAKE2B 33ccd0d0c93571d76bfee6727b62a826388cbe39d1b757ba81f9ab77bb2d05994b675e22f6d73829837e2fedf3396ad4cc2ad28c0bdc85c6221f7825c0bb008c SHA512 c33a36b8cde439d4a760d3ba328c8a52c51fb7b29f79e67009e5bb25acc535983c6d3738ed1f09fc9d2398396522f9abacdee98598e2e510d3d1ffcf66c83838
 MISC metadata.xml 849 BLAKE2B 6c18b0b74354faa0b9cd8922433cf3eca1a39dc0a19eb6112284561bd33b217d1be5e1f6b1813de01c52705442c51c8e7a806d8866a29f717306a260d9230296 SHA512 f626764b52b8a4068f954698b48a304340f34255297b25597786db8992227e354a3503bdcb900e578b1b39c9936faf3d09ea27ff2c26740f10aef00ee442c4a4
diff --git a/sci-mathematics/wxmaxima/wxmaxima-23.04.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-23.04.1.ebuild
index 552ce4da0c45..55b59875ce40 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-23.04.1.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-23.04.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${PN}-Version-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 55ea0a29c4b6..f089bb459f00 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/goawk/Manifest b/sys-apps/goawk/Manifest
index abebc5c4012c..8570827a047d 100644
--- a/sys-apps/goawk/Manifest
+++ b/sys-apps/goawk/Manifest
@@ -1,5 +1,3 @@
-DIST goawk-1.22.0.tar.gz 1676447 BLAKE2B 315874b8ee6334dd74fc86727340d3e14e01aac08880d562bd6297bcf42ae577e2ab6aa187e2f82616029b2fea9c64074193869fed01a8baa4423a5bfe73f45c SHA512 4109ca6e73f2eb87ef9d5b123634fb01cc92e8867aeec19be3d5b4744c7bd07747330fc6a371adbb52f2cab1fb51b43e9be6d8a851a0f0c5287c6039d497147c
-DIST goawk-1.23.0.tar.gz 1678139 BLAKE2B 0289ff64bfcfc7f14e48fc7d0e60e287b52d78d48dc8b21687ccdd13ada1cc8f193b12a112ccb898ef89893cf0f9e5502271f1433d77f21b1db5b1e9df56a4a8 SHA512 e2a8dda1d2a8cad1aee5ec7107cac30ff9aa691c5d0d78d91691dba21921fcbdac1dde4c61aff8a7d1280f174caaefcb44e937df84e0bf46e7818085da26f902
-EBUILD goawk-1.22.0.ebuild 486 BLAKE2B d195a4f565f757be6c106908a92ba39067ece0bddcfc993e69ec2f3681f129f9c2acc94cfcf28ff51267e7a2452757c56384a8a2168663bed9a701bffeb7a27f SHA512 3be176b228282405c66fa4e5b99fa5ade79fb3ae625fa8d20c439b62cb57ef5c83f011d2a6e27336152d3a1c2fac6a3ed2b81467334c4b633d82cac33afee351
-EBUILD goawk-1.23.0.ebuild 486 BLAKE2B d195a4f565f757be6c106908a92ba39067ece0bddcfc993e69ec2f3681f129f9c2acc94cfcf28ff51267e7a2452757c56384a8a2168663bed9a701bffeb7a27f SHA512 3be176b228282405c66fa4e5b99fa5ade79fb3ae625fa8d20c439b62cb57ef5c83f011d2a6e27336152d3a1c2fac6a3ed2b81467334c4b633d82cac33afee351
+DIST goawk-1.23.1.tar.gz 1678471 BLAKE2B f87037cdb5f256d5c3848f7fb0e64d81672abfa03c15d9b778fac14804c252ea140b3b436a09ab2189364b180bd1b638ecd66e767dd72532cc0f051ca2255097 SHA512 64f56f5ffa512929aa83d4df0360894ef231fdffe1879a72ed723606db77bf001ee744b646221a6042ef2cd3cb79fc8c80e33cec992b0b8c61da9f41ba78650b
+EBUILD goawk-1.23.1.ebuild 486 BLAKE2B d195a4f565f757be6c106908a92ba39067ece0bddcfc993e69ec2f3681f129f9c2acc94cfcf28ff51267e7a2452757c56384a8a2168663bed9a701bffeb7a27f SHA512 3be176b228282405c66fa4e5b99fa5ade79fb3ae625fa8d20c439b62cb57ef5c83f011d2a6e27336152d3a1c2fac6a3ed2b81467334c4b633d82cac33afee351
 MISC metadata.xml 318 BLAKE2B 1bc03337ba487236a6383f479302000f84b599ed693cc52e438f17c7fa41385b30879bf3ff6e13756f80a1cd9c82b8482b9baf607705e72cdceb540b4a83c420 SHA512 bea14196826043116194b13ab92a5cf54af3df5ea414208415f88067a87ddcc86acfe0b6967f1cb2aa077e4d55a8142192da55cf668cb1d0d4c07042249d5e03
diff --git a/sys-apps/goawk/goawk-1.23.0.ebuild b/sys-apps/goawk/goawk-1.23.0.ebuild
deleted file mode 100644
index e138a7adbd3d..000000000000
--- a/sys-apps/goawk/goawk-1.23.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="POSIX-compliant AWK interpreter written in Go, with CSV support"
-HOMEPAGE="https://github.com/benhoyt/goawk"
-SRC_URI="https://github.com/benhoyt/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-src_compile() {
-	ego build
-}
-
-src_test() {
-	ego test
-}
-
-src_install() {
-	einstalldocs
-
-	dobin goawk
-}
diff --git a/sys-apps/goawk/goawk-1.22.0.ebuild b/sys-apps/goawk/goawk-1.23.1.ebuild
index e138a7adbd3d..e138a7adbd3d 100644
--- a/sys-apps/goawk/goawk-1.22.0.ebuild
+++ b/sys-apps/goawk/goawk-1.23.1.ebuild
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index dd192a6250a4..36881a27b17e 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,12 +1,10 @@
-DIST mawk-1.3.4-20200120.tgz 468855 BLAKE2B dd8bb8f66cb8bd67d8415ee25ce928113cf3f33f8135bc432a16f30b83df861cd2e29da9e0fac1dfb1a6796239d0c838ed72cf51467f8ed79b96068e3e1f1e93 SHA512 14d9a6642ce931bf6457d248fc2d6da4f0ea7541976ca282ea708b26df048f86fdf92c27f72d497501ccd43a244d1d1a606f1a2f266a7558306fea35dcc3041b
-DIST mawk-1.3.4-20230203.tgz 401433 BLAKE2B c8756a09078becd942f53bc70c4da79cb97092f05bae17de4e4f7333564ff8808bfec311c50d1e61c53e9b42d92e4e1a10e70278e250ea40d822bbb9c7a783bb SHA512 641874d4d41a8e510144ca5359dcd8a38183e18854211f8beb91d0d8aa77f3ca9d577a6b5a8762d0e2f2dba5cade93d64710e2b3e64f0082d312cf42cb2dcca4
-DIST mawk-1.3.4-20230203.tgz.asc 729 BLAKE2B 8c5e06c87b6f3dd5262f438edf3932526efc20efc34821620a59094f828a478ff2a60b533456e609e161cb23bea3f77bdbc2975b3055b1206708ccdda9529c05 SHA512 6a077721e6c1d3929805676a02e2d4c5ac68cdc50c5124552d11b305216e419ca8ae6637f79f0b8fbab34a82543ed10d8f8f7f93f9e339cba4dfd3c37488f18a
 DIST mawk-1.3.4-20230322.tgz 401674 BLAKE2B c79e6736c1889fc43b0071dc8f88764b5fc3978e8ae6368c2395fc0947b867d414466533369a52f9e6a260dd29a4e273ec975eaa5607bbbd0fc9fbead5133620 SHA512 475f64acfbde686caf65ae3f227b75e1c2578011333467612d44c0e4658a49fa6c9c75ad3338c7ffd33e24d68b3d8156a0f1ad1189b60833597016060e6695c4
 DIST mawk-1.3.4-20230322.tgz.asc 729 BLAKE2B c6b44d265e724008dd5eb4b2dda02153c5434be00136184065d7e2be19b357df17ff5ac8360238795b3bae206001031859241abb1947f043e0a3aef7d6037155 SHA512 bc9a2e78950e5cd42a3b6338f9ccf17d2f470f19b81c61e10e89fcd33fdbfa45a5b39c53aa0384195ff96c1d593a0cbaed0943b2b63f6f13d0bd4853b31a1015
 DIST mawk-1.3.4-20230404.tgz 403027 BLAKE2B cc10336c902fd72dbcbafd5638699cbc18d9c650451c56d4058a2c716b378060404b1c3e072ef114a73c2a1e0b43886711c6697e408ee10164049af84cb79063 SHA512 cc72b2f163f7809b9d2f6ecd4130663b1184be2025ff8727fc8659cf7fb4b3f9fbdc41c8a0443ccbe5e455b45fcc42e8722caec13b63546b9b03d010093fa484
 DIST mawk-1.3.4-20230404.tgz.asc 729 BLAKE2B 10a9bf264c75d24139a0715031ae732237602589b5d7ed8227e88bd1121c61f9770270ec7b03bd456c2eeab6fd9970fb07d0154d97dfe745ffa4cbf733839457 SHA512 7e6cc764598046834e95cf5451376024f9f0f05efc1b3acfdbff38c182910b42561fb77eea06d42b791fdb0fc552b7e9e60cdabc313b03d2c35401b2a6193664
-EBUILD mawk-1.3.4_p20200120-r1.ebuild 985 BLAKE2B 162862e85225285b34ebc5a76a7b2e57f8c05655faca2578386acf029cdbbc5cd118e3c1c5c70d0a65bc990b17d16a1c74102d2e288890c2522702959926dba3 SHA512 369b36f09414fd527d65cacb97894800a340ca602f4b8f9ac30275416e67aeda1e2cf38804f0e7f9b5d28e921b49990138eb822564af623272b0177f1e6c71a6
-EBUILD mawk-1.3.4_p20230203.ebuild 1225 BLAKE2B 173817cd4cd22aeb070a0470f712cb3edc810acb0a840374424da879521c7d098b865877bcebade99e0a209ae8e8cde74b9cbc845d9b3efd6cdaa4e9687335e8 SHA512 b8b013bc9023fc3efd0c4598112f7c6cd1bd90bc399d8f154dd36bc105b994ac8b8c9a10e63d6e05fe3ffe85bd275b550403c000ba276d1819c0c214e48eb496
+DIST mawk-1.3.4-20230525.tgz 403222 BLAKE2B 9ecb6e469b4318dd78fc70f15864f9cb622e62d0599857880c514882180320596b244d79bb5a0a384f2622d7424e49039110cf0c626723c7491effa964b657f2 SHA512 704c1a94569e8e953af7b00ea81efa20df03483f57e4183935e73df62309874644f2250a307b136af34ce3df62d90170d8afe7b3a86eeacb31cf5845056126cb
+DIST mawk-1.3.4-20230525.tgz.asc 729 BLAKE2B b1c8d4cc9660a6e35564f955cb51b48ef7656a8e5cced230e9cdea195565133ac74eeade06d2b37bd60e3ee29d44f53bd1ed80cc9c6143d346583aa73f317e34 SHA512 d3826291598db6d7ffc60571f125a1efeab8abc7ce1397c07a2b1bb8d0439091a95f7d0ad19bd55b629dba2eabf9719eeece6fa7c50d246e4d73ab8564742ca1
 EBUILD mawk-1.3.4_p20230322.ebuild 1297 BLAKE2B 2441a6a9e0654d55e0abf9436c023508f9928ae2d27264c88b4bf69220ac16fc2effc7ecb3a2b28a527a5e9eecb3835784483ee0bbc45de529e20e83458fc16b SHA512 9530150a54bf4adb17a9dc24719304e145163fabdc53d9ad649d8ccfed9cc697afd6d27f91429a39839bc88dc24989b49c52f6acbda97554842f13c9008ac948
 EBUILD mawk-1.3.4_p20230404.ebuild 1305 BLAKE2B 5555b4d2e6b60e114c6cdc0c5fa626c0d54644344f3130ebc077e023a48870fc9504c5240210bbfe81fcec5de74476a708a44c2442b64e6369a5e1afdbfa1e82 SHA512 2afdcb0a33b1b082c47f4a9021871a514bab190c9b69d84b20962a980014b7669e8848d0011846f99168cadb861a024343986c079564a4a45eb05d1969853cfa
+EBUILD mawk-1.3.4_p20230525.ebuild 1305 BLAKE2B 5555b4d2e6b60e114c6cdc0c5fa626c0d54644344f3130ebc077e023a48870fc9504c5240210bbfe81fcec5de74476a708a44c2442b64e6369a5e1afdbfa1e82 SHA512 2afdcb0a33b1b082c47f4a9021871a514bab190c9b69d84b20962a980014b7669e8848d0011846f99168cadb861a024343986c079564a4a45eb05d1969853cfa
 MISC metadata.xml 422 BLAKE2B 8bd344848b5247eb1858b7cd31d91a796671c321610b826e602d9350e59769a4e6612438d9bf89ee2d6d63c327729d88a9ccb538b162beb816fde2910d0a4d9a SHA512 9adcc3c3b54ee935d3363e874e76f9e9b1efee00faac94184a84d10a6600dad4f11da51d4567acabf63707ca55f9b3d5ac3df107c6de8b38cad1da9891e82086
diff --git a/sys-apps/mawk/mawk-1.3.4_p20200120-r1.ebuild b/sys-apps/mawk/mawk-1.3.4_p20200120-r1.ebuild
deleted file mode 100644
index d1b6bdd8ffed..000000000000
--- a/sys-apps/mawk/mawk-1.3.4_p20200120-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P="${P/_p/-}"
-DESCRIPTION="An (often faster than gawk) awk-interpreter"
-HOMEPAGE="https://invisible-island.net/mawk/mawk.html"
-SRC_URI="https://invisible-mirror.net/archives/${PN}/${MY_P}.tgz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-DOCS=( ACKNOWLEDGMENT CHANGES README )
-
-src_configure() {
-	tc-export BUILD_CC
-	econf
-}
-
-src_install() {
-	default
-
-	exeinto /usr/share/doc/${PF}/examples
-	doexe examples/*
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-pkg_postinst() {
-	if has_version app-admin/eselect && has_version app-eselect/eselect-awk
-	then
-		eselect awk update ifunset
-	fi
-}
-
-pkg_postrm() {
-	if has_version app-admin/eselect && has_version app-eselect/eselect-awk
-	then
-		eselect awk update ifunset
-	fi
-}
diff --git a/sys-apps/mawk/mawk-1.3.4_p20230203.ebuild b/sys-apps/mawk/mawk-1.3.4_p20230525.ebuild
index f9ab69985bae..23e30e355999 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20230203.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20230525.ebuild
@@ -15,12 +15,16 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
 
 DOCS=( ACKNOWLEDGMENT CHANGES README )
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+	arc4random_push # doesn't exist on Linux
+)
+
 src_configure() {
 	tc-export BUILD_CC
 	econf
diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest
index 17b0fafd28ae..707923e94571 100644
--- a/sys-apps/moar/Manifest
+++ b/sys-apps/moar/Manifest
@@ -1,7 +1,7 @@
-DIST moar-1.14.0-deps.tar.xz 4808044 BLAKE2B cd7808337af5acb2bd6cb4b9696c9d04803df033b5a1d4904418602dc629cef7c16172b0eaa57644be76a02b6727d36f767bfafba1377ea95eb827fbb4a1d34b SHA512 e51ca15137f4b5dc5ea447c200341aaeb06cd77118cd8f2fb3efca0ffc2d4199e00687f980803c4ff09c535621b58206b22bff2c944ad8786c73c3a7c886d6c6
-DIST moar-1.14.0.tar.gz 2780033 BLAKE2B 42e985aef677830782e70c60748ce732a572352dad629126873bd9532314924ba4e8afc2be4ced0d3161b00b5d4088782908ee7a2f24d670aaf7ddf243473fb6 SHA512 ec0e851f031a03d8af3c4b8b11be2eab300d46adb08fd366d41c958f0d2227fb82800974af3fda72ac01a79e4d2c65e41816b2f1c4ec3b3c7534aeb9b9ded51e
 DIST moar-1.15.0-deps.tar.xz 4808044 BLAKE2B cd7808337af5acb2bd6cb4b9696c9d04803df033b5a1d4904418602dc629cef7c16172b0eaa57644be76a02b6727d36f767bfafba1377ea95eb827fbb4a1d34b SHA512 e51ca15137f4b5dc5ea447c200341aaeb06cd77118cd8f2fb3efca0ffc2d4199e00687f980803c4ff09c535621b58206b22bff2c944ad8786c73c3a7c886d6c6
 DIST moar-1.15.0.tar.gz 2780805 BLAKE2B 6a50018596f34de7d43fcedf0155141a6cd8d5896f34a05b44cfc5180d00e17caaf46377ecc3bb273fd5e2fd4536ada94e82cc7a8788cd14b030390f22ba40a4 SHA512 deedb8bf6f28f68a1633296a32a690df109c867023980125f7550111a3cf20463980c95fbddbafb16175aa03c46f3bf6150fbe066508cedffce49dd9bf18a90c
-EBUILD moar-1.14.0.ebuild 820 BLAKE2B 2e027326f5d58653b7e84d695d675495329c22abe4a107fe3534d181ae43a45394cd80b1d1d2951004d61b9b473fd964e6f69c70539ebb83af45fcf7553ccba3 SHA512 60dbd1af440d29010acdabd0d0a77ed2f5b3d4240acd18d46e9a7acf5a062bb3eb57bc08e8fa3215707473af81f45520c3f94c829ac0859912be0a3215906ce7
+DIST moar-1.15.1-deps.tar.xz 4808044 BLAKE2B cd7808337af5acb2bd6cb4b9696c9d04803df033b5a1d4904418602dc629cef7c16172b0eaa57644be76a02b6727d36f767bfafba1377ea95eb827fbb4a1d34b SHA512 e51ca15137f4b5dc5ea447c200341aaeb06cd77118cd8f2fb3efca0ffc2d4199e00687f980803c4ff09c535621b58206b22bff2c944ad8786c73c3a7c886d6c6
+DIST moar-1.15.1.tar.gz 2780649 BLAKE2B 79145ae426f5ae77d73dd556521135bfad21af3841818c4092eb476a52b408da86a4ce1f4c8e43712e74be233b7fc9469788e2134c866e8bb8ba83927c7f4f2d SHA512 c58fc57f583e8051c3e1f567e9d8ad0aca45dcbfb1998d0156cb07b90bc2359d70c8fe90849f753f969980af919d9faef82cde7dedcf2aa9aeab4c080edc7752
 EBUILD moar-1.15.0.ebuild 820 BLAKE2B 2e027326f5d58653b7e84d695d675495329c22abe4a107fe3534d181ae43a45394cd80b1d1d2951004d61b9b473fd964e6f69c70539ebb83af45fcf7553ccba3 SHA512 60dbd1af440d29010acdabd0d0a77ed2f5b3d4240acd18d46e9a7acf5a062bb3eb57bc08e8fa3215707473af81f45520c3f94c829ac0859912be0a3215906ce7
+EBUILD moar-1.15.1.ebuild 820 BLAKE2B 2e027326f5d58653b7e84d695d675495329c22abe4a107fe3534d181ae43a45394cd80b1d1d2951004d61b9b473fd964e6f69c70539ebb83af45fcf7553ccba3 SHA512 60dbd1af440d29010acdabd0d0a77ed2f5b3d4240acd18d46e9a7acf5a062bb3eb57bc08e8fa3215707473af81f45520c3f94c829ac0859912be0a3215906ce7
 MISC metadata.xml 316 BLAKE2B 19b5d071afbcad1f05744cca494156dc634f3fc35afaf4828dcf1e691e75a0f47f162b6cf548e5a333441f25327970f6a71d6acb436b60a68deeb7fb44659d45 SHA512 44155ffd972d79d47e41fe2ed38583e41eaaeb9f6b0de7e52b666930906f561e73d1f604acf602750ae1bed50e516dbbe36327b47ba2005813438e0d2db070e1
diff --git a/sys-apps/moar/moar-1.14.0.ebuild b/sys-apps/moar/moar-1.15.1.ebuild
index 177f577621ac..177f577621ac 100644
--- a/sys-apps/moar/moar-1.14.0.ebuild
+++ b/sys-apps/moar/moar-1.15.1.ebuild
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index fbc4ae5ff582..6375b337de1c 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/reflex/Manifest b/sys-devel/reflex/Manifest
index fa2057b38a3f..cc17e651365e 100644
--- a/sys-devel/reflex/Manifest
+++ b/sys-devel/reflex/Manifest
@@ -5,7 +5,10 @@ DIST reflex-20230206.tgz 476372 BLAKE2B d1619518546d8dbb4865f818b538624b8b88947e
 DIST reflex-20230206.tgz.asc 729 BLAKE2B 5d2e1a7baa6fc0c8c7da32884e14c6a8b647d29d830be72b381fe2e0134eeb829f78500af2be71ed81f86b9bad9a26ddcd98b233b23810eddad7d035e04363d5 SHA512 8cefa7a27e676c56de8b898a2383b6ce591ff7e704cbbd6cb7a598696a5d0d67e2b89af4a9fdcf138d728a831a80a2fb67cc7c82d21f0b9e470027e28d41ff72
 DIST reflex-20230521.tgz 480866 BLAKE2B a6f5562de3dd10343e8f11bf286256cbbd8f4f0c6d5801ba55321ad0e2599b6a591aa2436f3fcd0251426f57a2da05cf357d55e14b68fc6c75cf44d99ec41b74 SHA512 789dfa4a2f412cbfed34435a14abf70d972487f226b1df82047f1269c173edb3881bc06ac92ffa2551e34a568553832c26e2a85cb70ea718f573ae1e631b1da3
 DIST reflex-20230521.tgz.asc 729 BLAKE2B 4ae6532ffd70b46d34948eb134f5780da913e86ba86bb515da0c31ac25278ce64cdd5e66b50009854d032761264996b0085952c3b238f9fd82c613dea295dd9a SHA512 ea479a810a418c192d52b5d7180212e06b4426048525f2a845b17afd0ab9918b5e2779e545d2857f9abf89f3d56ee37fbed6330fefe4f2b81eb9ec11e0cea364
+DIST reflex-20230523.tgz 480999 BLAKE2B a7306367bdf5bfb542a44f29c382a5d889a176059d95539916ab3132de06401edfd0c6a476ec66f433d56398039524d79c6879e1f24b4e813ebbba98ea434ed3 SHA512 9704b6dc3327bc017175bef21f34f53ff6614a76692deacb4af99c29bd4330e5fb7f71af6497d233acceab148bc8a7911d41d3ca224110812e5883c90cc801f2
+DIST reflex-20230523.tgz.asc 729 BLAKE2B 0249d1bc4f6d6395be0f51f90e1f9834bc63cd7e4b5565e71ff0502746f45ea04b611c8db70d62513dfe95d492512cf1935f4e70d582c960f38d11e06853f54f SHA512 48e2f84c8932a038366159ea6a26eac73510bb69b6bc3c5027195682ade4ef3a33ade082b41e4d08af0c23c6692abc8ee46b261796d72709aa9568070c16c20b
 EBUILD reflex-20221012.ebuild 857 BLAKE2B be5be3f19758602fbd3a3aaeecf040ec7a2acf0c3b062cec951874545d1938ad0bd31f8cc177fc3647a6c5524694745e3368ab3100b8d7cb9ad95605e9a66d31 SHA512 c49b306665fa54a2c1a868468566f40db79256375e8c885667da5f041d2abb8319e24f1af6206f97b8445727d1332c6b6c7dcd1c203e05bf63ab3656ea8412f7
 EBUILD reflex-20230206.ebuild 934 BLAKE2B a29022beba7a93599e2ce974217b34f031b8d10debb7666f9f03b17dcbe5b6d85064fbbf0f91110b6f98145962693374bf643d9eca10d14edd6e408c92175ffb SHA512 d2110c9bc628d7922681154f9e7dfb82b8ffc03c296d7d8198fa255d411dedf1ea6054881135ef9d2a0a83cd82fcfd49d6a547457c2fa1045d0323ef343794ce
 EBUILD reflex-20230521.ebuild 719 BLAKE2B ec076559c135944642808ed5e4d215183fbe38fa861f47dbf45daa916cfdff03d1261e3bc996520fabee06638059a45188235cb1e7c05d9570fe1ddf8e54a125 SHA512 4884804b9d288e41be413fee670c23a37e2911b81043c259e46a82bb9f51fd0f74618519279c14ac02d3efc4003a99426d7902cdd7237d94e0f08edf539335d5
+EBUILD reflex-20230523.ebuild 719 BLAKE2B ec076559c135944642808ed5e4d215183fbe38fa861f47dbf45daa916cfdff03d1261e3bc996520fabee06638059a45188235cb1e7c05d9570fe1ddf8e54a125 SHA512 4884804b9d288e41be413fee670c23a37e2911b81043c259e46a82bb9f51fd0f74618519279c14ac02d3efc4003a99426d7902cdd7237d94e0f08edf539335d5
 MISC metadata.xml 405 BLAKE2B 593dd39b5718afeb9441efadf2bf2ecf533ce076e21d7271fe6dd4a0f0c93544cf6b8bf1bd0e2b67b76213b5a0aa2687d95effd268976d378c701e49ae9404ab SHA512 a9345e50a04acc81a7f0a1213c8986d1bd068b6aceb0170a6a1bc8772285ba6794799470739a8c9f4ee6b2dfb7fdb440ceb1f0c639f3d0775a77db500b55ef2b
diff --git a/sys-devel/reflex/reflex-20230523.ebuild b/sys-devel/reflex/reflex-20230523.ebuild
new file mode 100644
index 000000000000..40734b6c5168
--- /dev/null
+++ b/sys-devel/reflex/reflex-20230523.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+DESCRIPTION="This is a variant of the flex fast lexical scanner"
+HOMEPAGE="https://invisible-island.net/reflex/"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="FLEX"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
+
+src_configure() {
+	econf --with-manpage-format=formatted
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index d9f27b923d94..1f6c9ec9775d 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 890ffa414206..90e87dc56639 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.15-118.base.tar.xz 4596840 BLAKE2B d33cfad9149f4f80c98c649c52b
 DIST genpatches-5.15-118.extras.tar.xz 3936 BLAKE2B b74dd7b0194cf6881ef699d0b1db858bb8c44780d5263cbf136f9d181a48420ae31886cd762f819a91b21a2f2acb83f3c46b1950dc53367d8efebe8c86a9317b SHA512 1a3671f3abf8ae04afe50639fe27dfbc07f9f51b297effcd587704f88efda801d3df3255f9d04acbdf4bfac9986a2788a54f4e9fe22344aa0166bbc3de260880
 DIST genpatches-5.15-119.base.tar.xz 4664324 BLAKE2B 8d594786237d670753f237a4948f5d0e7a85c9f5762f082fdc65dbdad9bdf84422c110d7da2defa10eb548fb03cf42420d54dba7c8b62d51bd1ae04446294783 SHA512 8cc047640fc20b1cf9a91809f0ab4ffcdc00e69441f52c7a14d411b254f6cd7e6921dc1e037402341dfb443cfc08a3032540dd1fb8c2c5288a15100eaee896de
 DIST genpatches-5.15-119.extras.tar.xz 3932 BLAKE2B fe9680afdaf4153177cbb2380361b18fa252f26a93f57b64e14fd761774596576ff3269bca33fbc6f41dc58d2804e67a664d44167dcd75f8f63c33ff7cc3da75 SHA512 ce0a62af36ef19b6543eaf84491447d65d11bf560ec6db450545b5b88d37552cd3933aed20afb0912e12671fa11de6e5efac6d668f593eac3cc4078d170d3c7a
+DIST genpatches-5.15-120.base.tar.xz 4681108 BLAKE2B 7e69c38991ab3b5ec949f48fff8564c854017b8bafac61747eede20f79d71dade59effaee29fe849b1fdbee7abcaeeeef3f55a39b95b96bda6a70af05a905a68 SHA512 2be319896281e7cab1646da40a3067c3815270ff5fb29edccda9138862a39ace2192a1cd38a4232bc14ebed0d6c0c877a9fd58f225d7cedca743664e2a993025
+DIST genpatches-5.15-120.extras.tar.xz 3932 BLAKE2B fb00b97c8b61234646388bec0dd23a1310a7bdca9d04a2048a32a4e30605662c7001188bc125170aeca2ded63954a71b612908286aeab06928dec00cedc76902 SHA512 c2b6ee91b3505dae7fe78a393001cdf6ac7d0020f8123f14d961b90d1424144996e182fcb5304d5890c041e2d940a960bac0795ebc22e85459285b16f67d9b3f
 DIST genpatches-5.4-249.base.tar.xz 5692112 BLAKE2B 8057ddb24ebbd5ee1b4fb5f5a36b295c4e8ab857e407c5b9e061780e1d23ecca7ab5adfb10ca4f6733a7776c2aa6e353419257c255b07bc991ecb6857aa31555 SHA512 b0057da850ab5368dcbf2b454d408b72204150cc2643e087d2f084c3074de22ce36fa4c319552b90d9059ba279e8dc6551cd6348c3616275b050167bfdb58023
 DIST genpatches-5.4-249.extras.tar.xz 1812 BLAKE2B b6b7bccf77851a17e8b514439a50c44de954ff461af71414c325ca5c0a65d7a79ee92f7a8b708afd28a3433acddd13aa3bbd5afcd82b4181e57ea05b008d7090 SHA512 c4977abc2bbb1c2319e9d2e4aed38419f9e2a70813e5f28d2b799533fc945574d9fee21c881b6dd4926a9c2ebe74ae414ada4993e3fcbd117b6536f983533282
 DIST genpatches-5.4-250.base.tar.xz 5760352 BLAKE2B a0780e42391ad416839c34d85f079f11e9bf1579a293ea1bbdeb95e08e76d1d3f7956fcf9c83eb85223016bd4816d23c87e0b345bcb61b5076e5bbbd42024244 SHA512 8dd686658217cda074e0731c84d3e8c63bfa914b7e607eab28ab46c8cba647591fcd0a726108a08c826290e9edb01f29b6bd135af0991d818666a853764eb11d
@@ -26,10 +28,14 @@ DIST genpatches-6.1-34.base.tar.xz 1760348 BLAKE2B 9a7672bf2f106e0df50997d746171
 DIST genpatches-6.1-34.extras.tar.xz 3808 BLAKE2B 9830d4850e5095ef0864df0aaa25a4549678fb76b22807abf61739b42b048455535aff7eaac16bad5d2cdb0cca65efd2e176a50f40a685250df0b75565fadc36 SHA512 13c8f7f596eeaa9b78be7aae7667a196e199fbb8d3cc045318dfdfe1ab340622fd0e958be09ed8608f9667231d6523685af1f03f4f2b52d78810885c0e9fe4a0
 DIST genpatches-6.1-35.base.tar.xz 1862704 BLAKE2B b6fb58876bf303e807a429d63c8a932798a73f95275ca1137ca672477d8004404f931e09e681c92202fda9083a44dd53dd0b93d1e503f2bd6e177c44a9c10425 SHA512 df18933b2dc32af5a0760c8419d0f69d2c221c4d12aa8c64ec7d38be8407930b79d507f5312d9e9d369a51a192196dd36a8b919e78c81d068f7ea5989be8c8a1
 DIST genpatches-6.1-35.extras.tar.xz 3812 BLAKE2B 3784c4bc551ad594a75de1f174112f80c2e805f5ab2f1fc20642162e72ad785c03ac7e90be19497b6826810d706e36b4f40396e45ba95a6a40f7ba296a3d2930 SHA512 4666ba408cfedbf2d6858fde80699c7d533cf24724598c2b719bed365021eebbad7eb1872008b1bca2f8da77ab31b20d56ead15d9c7d0cd6135f117510a87c89
+DIST genpatches-6.1-36.base.tar.xz 1892196 BLAKE2B 21e7b006889ce39d3b2afaa981cb04c1229050d13b944086ac2c51add6c63dc96c3ac2dda188dfa11a45343904e26589684ffea3a22c235738c1c6d8c38a11cd SHA512 b4de4f6db586a9aafddf639ae914b35ffb0e2340ef312c64a48f4a0bfc02c573437595fc61596245dec2eac7add9f62925e575e2f621d2cf2e80262096f64df9
+DIST genpatches-6.1-36.extras.tar.xz 3808 BLAKE2B ba99390043e4a62ea1322364ba601440fd70079ffb98dea924f91aeb00a7add4d2402e16589e0406e66ff9e0ec7a9d0d76e0a14276fe486507345c8ebeb82bde SHA512 ab4170a7b75c2617ccd5c08b7c5d84e68e593cacdca70dd59ed0b738639ddf3bbbaf6a4758728ff74026478a341782eb0e73a6a40ef9a7158f9c6221703afc55
 DIST genpatches-6.2-19.base.tar.xz 1082064 BLAKE2B a25100f54e9775fb220e2debd088c2d9e822e0c8e80da51f34f2372e2b2ee9a09f64fde4ab63e7b53ff1b6c5c0022d52aa7fb6d023a234ef520b3566bf4055c7 SHA512 bae1c063f9e624ebd935681ec7323b7c4fadecff63c2f4cd21d13731a70b549a4128c59a03e282c502bfd9b631ca6ec876cc782a90f633003dff97fc05c95eae
 DIST genpatches-6.2-19.extras.tar.xz 3808 BLAKE2B cd58fa1bc082b4cc6f45e1d8332921f78ce4eb8356c6510c6df2eac06778695ec98e4f68b6608bb22b66486895340595c13a9b59ed5316b3a6a8d27e86a796a8 SHA512 b69b534b8398ea2cf8578dca763736c6ea071959c37f4c2fcc0ff5ea9f35cee2e88637567979211d242a04f2015fa3ba6765b5e2173a9ab90c69e5d67b02e9c3
 DIST genpatches-6.3-7.base.tar.xz 466812 BLAKE2B 830f25190bad0be6dbfd45ebc748bc5ef6075cb13466f6cec02ba075d1af98d8ed7285506746631bcea71dbab007290c5b86cc8970c02e5aad5bd37d92d4b9c0 SHA512 65d9ecb216c900aec0d265b849fb40f8c141bda2ea4150d93f24f84c33eedf67b8966ff50a4ef65b0a3ea0aeabacacbfab45203c73dc3e83c1f7758d54b8a2e6
 DIST genpatches-6.3-7.extras.tar.xz 3808 BLAKE2B 097c661baa4c4342622cb548169258be534099a9d3d6ec55ebdcccd03f2cdd53ee45bc3e3b96650ffd3d48d667b9a4b8b7ca0d0bc3b0c990b44d1c7d7553d604 SHA512 0ee09931b9e9ad8a3cc266b2c9fe68ce843971d19eecda98765ee92f2ef210b475eea752dd7b44daca61af1b404a28a694dba09f457166e94227aef8661a2780
+DIST genpatches-6.3-8.base.tar.xz 502012 BLAKE2B 190e68ecc877c5520413129ad7d28f8a088775234c18f59f74a4675b1256c7da1d8dc1b323c232523fc3044f3dd4988a77ecacedda715ff3431f910b7b0d58b7 SHA512 02f4b62eb098d875e4c66325f2abc74917fe0d88c1c35ee84ee2a19da878addd27719e9e2a0dca145707335338eedc905407dcd54c6706ec18a2f0920fc082b6
+DIST genpatches-6.3-8.extras.tar.xz 3804 BLAKE2B 461a2a8fd04a4a7ef2f714f5472d2169b4119dbd42bac961feb6b890b8d7def33931ac8dbe423e9d8ee32e60d56ca01bcc4c814c18e445da8d8bbb9b58a6a717 SHA512 fc563f898ee88024d4b60eec567a7439893339c9f51b4eb9a09a0b16b1c7fa164260e63396ea923e776751dfdbd52d2cddace03f212419d4b145e38b5d670dad
 DIST gentoo-kernel-5.10.179-r2-1.amd64.gpkg.tar 66344960 BLAKE2B 03d3655526dfc67e16ba74ecacc8e030538cec241905ff384396740482fe64f41d7c05083d86293bef2bf699488b1077bbad7630a92fd20a03d22327ba5d7f97 SHA512 fb803d494229b41446cc19fe24d4169726870faf8501edf1fd07995128d86e1eaaa332aa870f45573ac7d8098dbd80787277bbc5495164735323e3e8f5f98044
 DIST gentoo-kernel-5.10.179-r2-1.arm64.gpkg.tar 59361280 BLAKE2B 39210649bc4d6eb700e437398ddd8af194f5266f2981fa5d76598e55d25a11a25d3c19c49d54053cbea30e496dd30a22349313fbadf5406b31bea1747fdf790f SHA512 5e41a249f119a896a33c98641bed0a2ff950a7c3ac64da5f46e175014a49a148776f284087d101963265865c92f63f294101cbdba7147eed9a9e3c9cee4d0616
 DIST gentoo-kernel-5.10.179-r2-1.ppc64le.gpkg.tar 54917120 BLAKE2B e26d55c08e6b87cc77e9ccd414685075288f7e148a600930b6e4b47982a9341e7349a3898bd31ecae7ace7f8ce397634147141762e72dc9829581894fe2f68fb SHA512 04239ac68eb092d19852122a952669601674d69bf7c12a11a12f58bb7431fc6db199552e053c8f3c8b8661f15251fe16b099482854a96bf25c6a9790c36f1159
@@ -58,6 +64,10 @@ DIST gentoo-kernel-5.15.113-1.amd64.gpkg.tar 69550080 BLAKE2B a16f76058c810a2026
 DIST gentoo-kernel-5.15.113-1.arm64.gpkg.tar 62504960 BLAKE2B 25b6c09d59700bb103a72489fb594c26b6d38db9689984bf90e17ef1a7d8b862eb8430d1c4bce0008fd754194dfb30aeddbfb4e67b4a7341ecbbafc65670713a SHA512 66e2a4e23622c57c83f520ab5cdc38c3be19d860a7435c1107869e80c46257dffc5f2a1a59dce8c27f93977c2f99cdbc32cd10c361cff7a2ee88657985de36e6
 DIST gentoo-kernel-5.15.113-1.ppc64le.gpkg.tar 57108480 BLAKE2B 9e2e59c22499dbe2a349906f3384109574db6da4f588911f6617ae8fd44665c9b7be693ac44bdc655fee384c8ee7a326df3a2bec562f6378251246fc916e3b3e SHA512 675446aa59b92559812e21f47da17f76cc46c27de5968babde8d0ddb4afe89c255b67f8ef34f083f4ec723bee717732acd175a0cda91ae878d6c352f4e31c44b
 DIST gentoo-kernel-5.15.113-1.x86.gpkg.tar 59115520 BLAKE2B fbafe9571a7318d02372cacc9468f9d79074ed6e1e073034e2e414f17643f8d84638f6e346377cf8a35af898d174e6216c24a5271e87c61309d0a4c517e7023d SHA512 b83daa6fffd2bf177fb921c08626838ad851d315b8cb32dcf1673311623227eb9c55c8316aec741a49af6e6aaaed527ac4105df58033476f00a6afb2a8bc1850
+DIST gentoo-kernel-5.15.114-1.amd64.gpkg.tar 69539840 BLAKE2B bcc43fe6a4e17363f234a4e1bbc6cb4ac64f3d39fcf80258a7d3b3d4951ed92b165d5dd7e2f0921ccb75300f8a9e5058783752bd2b4944ee30c33e5241bc56c2 SHA512 bd63fc27132d722391a23884d60baa5cf407c223d519d46be3c47eb5c9496b0542cab93ce2bd7c7a4d8d52e19b8dbdc6595a6bd25ddba89f1a467a85aaa4be8d
+DIST gentoo-kernel-5.15.114-1.arm64.gpkg.tar 62515200 BLAKE2B 985311a49f8314cf5787c51dfb683a4372a842a4976352f220775afa8c335ed73e15deaaf3dc5be577d4ef9552dfd6e42bdb75295836aa71baaffdb75dfe24cf SHA512 3b182db4df94d3ad44e712284fc83838ba3f1676639fd57ace8d9346429f4dbbe3b011fc86317836fce2c240d54eda363a1465aa9e514eeb5dad9ab533a7bf9d
+DIST gentoo-kernel-5.15.114-1.ppc64le.gpkg.tar 57118720 BLAKE2B d825703befacdea4409fdece540ff5f940cb7b91a57e8e278cd3d345588029f0a355b16256071329fedb04e29b5b43d07443591fb1c238a3e6760cd89e0b5b1f SHA512 bb734a8e2223ca26fefc4fe3234429fde15b3c6368544b9a45c7115253280c43ded8795ab2a0c02988d30de90ee71167145336be5476cd1b4c43b9a68f2a7a92
+DIST gentoo-kernel-5.15.114-1.x86.gpkg.tar 59115520 BLAKE2B df62b2f821ae01a7e73a95af88a4c27caa4cf9aa39da91caca403ce579b27071084b104c33dd2ab2766873758aeb396834f8d98ddc31165c05812f787efae25e SHA512 be0fbab45f2b5f7ed907cfe3332571ffba9a18c02c6a052483aa4db966f6e733a116e9d4064918491b39f86e95f5393dee8725d0e3bb917a799b87797377f621
 DIST gentoo-kernel-5.4.242-r2-1.amd64.gpkg.tar 60508160 BLAKE2B 84cdcc58a34eb5253e9fe1e04fc4d7a57b5a849510f809f446c81b0b5e359f0157673e95ba1b027ea9b93209aa2bcec6aab06b5206032ff2edf9ceec87bb8cf0 SHA512 a7c8fa437003b43e4ba7e7bebd83c4a9e0c6adfeb16d5d2b401d6fa97e9910367fdd12993af146a272f3c50f38dc0372e7b21e2a7cbd70d92b7f5d362912a5f0
 DIST gentoo-kernel-5.4.242-r2-1.arm64.gpkg.tar 56535040 BLAKE2B 0c51e776f6179546c9ff7911c2d38a92b694f77f097392907bad8121bf7c7c22c55c5fec9ed6c871e71ce4bcb00a6c180a6b7ed8dc637d1e9a2790b8a536296e SHA512 9ccf63015358b119f07da66d4e0acadd1b6d941ed6f3341e636d4ebd87728d1126fbacaba8387b5a1da4c3071eb8835c964a3d448d34d107eb7d71e3e90cec0d
 DIST gentoo-kernel-5.4.242-r2-1.ppc64le.gpkg.tar 54210560 BLAKE2B 17c4b2e80a47535e384e36970e7aa4d876fc78569833ee8c92161233d620e6a9b76ef5386ed4c2555b3bf33f65b655f6024e0abd2ff73f1cbcd71e29c46f9fed SHA512 ecd6fa2bf630e75aff59c14ba82b5675cfd075a3d64cdb93a753a2a985e0d3ebfff6586d7ab87fd96e7f45026f39041d7541fe855706513309c2fcebd759f7c6
@@ -86,6 +96,10 @@ DIST gentoo-kernel-6.1.30-1.amd64.gpkg.tar 76615680 BLAKE2B 695a07dfd7a1e2ebc4d6
 DIST gentoo-kernel-6.1.30-1.arm64.gpkg.tar 69314560 BLAKE2B 8b2cd1a41b0b5866747692ff384473b9488d8cde39224ee9d3716e7902d02ccdacf3ad1e4c3362e46f13b2c95d382d2a16e34a38eb6c5184d57bc11ac317a104 SHA512 99d49cee001629db6b3c187c12480a099d4357d4e3f2c606a6252ade9a440d5085778f6fa62127967405ab2eba6867039877e4e638055ffc99c07e5199a76da7
 DIST gentoo-kernel-6.1.30-1.ppc64le.gpkg.tar 62720000 BLAKE2B 6f166db6bb269ebabe515619192c0e93278adaeec228cc400db4ceb951bd6dd84fbbff6dc23d5a6f5d61c9b2c0a88920a1eb5625998507d9a2ab693db43b2fa7 SHA512 fb9ca9bf10e6ee03f99d2301c8c17aad71979ae9ee12752f820db5604696bc3ab5a33f57ec1f4d05125cc047527be1d3f721d9ade936c108e1a1a2835844ab93
 DIST gentoo-kernel-6.1.30-1.x86.gpkg.tar 66068480 BLAKE2B 94816353dbcb1c002e479a0b486860bf6fc9afedfc461f634e21fc9a2538a5f9c412f9f5ce399d4cd5360e6161a0d743fb25b4772b40105a4a2a0cec0cc09ee7 SHA512 535fc8b6a5cf87a2c881226682dad6895bc21cc3665faa92027e88c6653b52502398a461415326cf8e802ef3af7c22d3d3da9babf3dd7f29552422b33d716ff9
+DIST gentoo-kernel-6.1.31-1.amd64.gpkg.tar 76656640 BLAKE2B 7bf643f5c46e77546e300ef4aa58fe67d9ebfad8a6404dbf3fd166af1f9980f473b70dfc03d1ea7589f02e59c1538627a0f5fa1731331b95c76fa44ee9f51a5b SHA512 109eda5dbfa28f42d8308208bc2240f604965b21a8a2c76ce76331c9dd85823fb666b04d5113677616cd385d928d5d916e73e10fd99995019a1c91394ac92a32
+DIST gentoo-kernel-6.1.31-1.arm64.gpkg.tar 69324800 BLAKE2B 57169ac151443e6eba0b83a7973e154eb8b43175c5ff44c796ce85726cc1684470e77a77968b46937dd44cfad789053acbe04c2886bc39375c8b652b46f06abb SHA512 4a453f8a22c8bc99c6bb83377139e8d9a37e540a3ccac494762a7a49c93fee0d3c842aabcfa8e8df7a88db1a2439ca5b5165d9dfb889e5ee0780003b972f185a
+DIST gentoo-kernel-6.1.31-1.ppc64le.gpkg.tar 62720000 BLAKE2B de2262a2d4192e3002eb61ef6eeff85424684b3ff4f1f67ac9fd05c7bd33daa7d6b3576c5436a1ab7a7e9bfa741306e6c6f1a215f4b5a6aa939a5df9bfecd5d2 SHA512 f1675afd84a62c4f1552dbcdf6dd108ef5d4b11a1f7af695ae263f9c40976fcca678532a4c2b4c34485ee463e6f7c7ca7668c0ea8dd825f3a3e362839d19a455
+DIST gentoo-kernel-6.1.31-1.x86.gpkg.tar 66078720 BLAKE2B 377a8d5141d71d8510fa31d263b98f93feb75e4cd8fad0592b386430998dc875736339fc643332039d0fd1b8ad6a5e65bf4b6f8f2abae6516090d0c5e7939a87 SHA512 fa6fbe87941f9ac359e9bbdec4fd87ae13749afc1d36447d9250611b73661498a6f473b6e442e5c94af3a367374560bb44459c4c583db4da219e4c44dab375b7
 DIST gentoo-kernel-6.2.16-1.amd64.gpkg.tar 82657280 BLAKE2B da4ae3efa4a19653432054d5d260509ebc728be136a413d61e700ca2fad1a656d4322621c03434fdd6ebc1433b2148332a089f6e6dbf9c7d60131fde28a874e9 SHA512 5f48a3e9979a2e9879c3df355194116a4d612a17853d36b0392e5ab41f194982474885296f5afe97a2e64224b055331da68fe696af60970798b67a91b53cd1dd
 DIST gentoo-kernel-6.2.16-1.arm64.gpkg.tar 71813120 BLAKE2B 9675c1545cdb1be365591bd54757eb3f1ab9df7cf573c0ceabe5971b8065c587b2f39098530a3085a8d7583bfc92601ee571d17fc38bc012cc22234e32d964da SHA512 6d276aec4ebcd53d6d62882e6fa1f453192891433348b87c259a34d40f2ffd6aa692e945a14802388f8789f1ca8773d9dda6758b6e147eb51bf5aad166f64c1c
 DIST gentoo-kernel-6.2.16-1.ppc64le.gpkg.tar 63928320 BLAKE2B 4e068dd011162ae70d3456652bd66745bfd5981ab065b67a3455c8c4a7dc5f16ed5d53b24468f113cb3012e9d653cdfc6c580b6d8f1a322d9782915f9896f9f0 SHA512 ec96651688940c9a6912055fd2dd43d8dc39bafc7efa853c843b3a279db8d482b96a241ea9089e38beaf4b72fc401a31dca68d9759c3a3eb03f8b7491e739f1e
@@ -94,6 +108,10 @@ DIST gentoo-kernel-6.3.4-r1-1.amd64.gpkg.tar 83394560 BLAKE2B 848a4e2a716afe09b6
 DIST gentoo-kernel-6.3.4-r1-1.arm64.gpkg.tar 72396800 BLAKE2B 4947a5e098d07767df632c66e47ca40d0886f422479948acbd64d49205d838c7aad482fa3bb9465809e99af27017d90d3005651656ecde4c94b21ec8e50feaca SHA512 e37649cf59b6b516e9e087a1de0f815af39950d0f7180d2375e897c0db1341ec2ff5d76044b3e5a95e8eecbcd30c67d966010ceb40c70978b99eba447c46fb00
 DIST gentoo-kernel-6.3.4-r1-1.ppc64le.gpkg.tar 64276480 BLAKE2B a483995680f15f8834126afafbf38b8d33622103745aa45e175c7eed5d6b84b2a1d324a32ef234da513b7b37e282da3a08babf4fa5b8e5c94b91607e78965c1b SHA512 b40e9dfb357d505434a9cb15ebe1e306ce4a3e7bacdc6225fa95c61363a6b5bb5f23e37c5b91ee12e084e74e0f45207370709f169724afb466c1d805f6b95a33
 DIST gentoo-kernel-6.3.4-r1-1.x86.gpkg.tar 67010560 BLAKE2B aa4db342844848b49cd55ffd3ba302920f0094691b0379a96fe62e660e1e721a27bfc8eed279398c716797f62ef9dd97f210cbc97ba27edc854134cfbe55a53a SHA512 68ada17ba6dd7d0a286d9f3dbddc3fa9cf79ea745e83274365ddce70a759d7391f953083c87aa969b29ba588314df6edad94b415c82065b724bb8b381d6c590c
+DIST gentoo-kernel-6.3.5-1.amd64.gpkg.tar 83486720 BLAKE2B 936bf3ec75b75aabeb4d8ca6b5a742a006cc6c6a1fd57760ffe72fd124d1ea3dbbc9361fc1f7ac4f64c3feaa2b213372cf72515577ae381c7921389db3e10d96 SHA512 9785a27d50e95c3dd9385b928b9dbc1e1056fd7cf999b4e1f675fa3ee724663671d8bb9de74a63588927cc5b984bfeff927e3ea9a26b12ef2009c7574804e490
+DIST gentoo-kernel-6.3.5-1.arm64.gpkg.tar 72386560 BLAKE2B b089996536ad9ac90e5fd382a490041baa3f7e2f4deb8945f961f454e042ef701bfb7ccc8259acca4a0a77fd104c6f0bea0a447aa90ee523eb42a4ef7eae72ce SHA512 1c666d1f210a81b2a803da4c3eab2c8464373cbbbe7b67ea2e6d3fd8bb786a6d13ecd9ece3d4dc7cb0b7487a3aa0eacfb80f9368d0b07d42c9ea7c0338659a63
+DIST gentoo-kernel-6.3.5-1.ppc64le.gpkg.tar 64286720 BLAKE2B edfa70df90d9efca3394776bb30711f51a2dfd925d49cc5310ea985112b8c37deb3658581eb381d4128154acec9a39c369f9425aabf448a6d9d6a53f6796efe3 SHA512 bb551d9a588e2b801b4ce8d5a65a34b9eed1b965ee0843bf83193dd1692473fba9e576d81fcfa69f63418b056d9784f5ccbf36b5ea742d4cbf1098d64ec0b3bd
+DIST gentoo-kernel-6.3.5-1.x86.gpkg.tar 67031040 BLAKE2B d26e5786369f939f07017497748eedcd5ea41abfc5a2a1e4b60c91170b8e18d25d967e62daebd0c80263c6cdd39c9c57b6babff5bc5e8550b50a3ecc4ef1b7e8 SHA512 03347b81892411944082da429015ab5d9e68337aa4fb882329fd7d8c7ae644de44da4ec893507f6657f2663b3d01f53eebafb0bb88daa6125190523ad9d96c2e
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
@@ -107,6 +125,7 @@ EBUILD gentoo-kernel-bin-5.15.110-r2.ebuild 3025 BLAKE2B 95e4eb0f4309e4141a86387
 EBUILD gentoo-kernel-bin-5.15.111.ebuild 3029 BLAKE2B 7e344f2c9619826058ab1e7437837bb2307480c9b5be1e52638b4d30cd458ed59f7053e896ab8fb7c02965a1df0f10f2d67fda031e2ee8764460134592585a2b SHA512 eb0c10f46c137cf2a98f606b0bd49fbd43920136bde57d445bc2feefd1d1ec57212b651510b9ad6a7ea37cef2d02e004217e136ed10ca23b39c3791162e5d8f6
 EBUILD gentoo-kernel-bin-5.15.112.ebuild 3029 BLAKE2B 7e344f2c9619826058ab1e7437837bb2307480c9b5be1e52638b4d30cd458ed59f7053e896ab8fb7c02965a1df0f10f2d67fda031e2ee8764460134592585a2b SHA512 eb0c10f46c137cf2a98f606b0bd49fbd43920136bde57d445bc2feefd1d1ec57212b651510b9ad6a7ea37cef2d02e004217e136ed10ca23b39c3791162e5d8f6
 EBUILD gentoo-kernel-bin-5.15.113.ebuild 3029 BLAKE2B 7e344f2c9619826058ab1e7437837bb2307480c9b5be1e52638b4d30cd458ed59f7053e896ab8fb7c02965a1df0f10f2d67fda031e2ee8764460134592585a2b SHA512 eb0c10f46c137cf2a98f606b0bd49fbd43920136bde57d445bc2feefd1d1ec57212b651510b9ad6a7ea37cef2d02e004217e136ed10ca23b39c3791162e5d8f6
+EBUILD gentoo-kernel-bin-5.15.114.ebuild 3029 BLAKE2B 7e344f2c9619826058ab1e7437837bb2307480c9b5be1e52638b4d30cd458ed59f7053e896ab8fb7c02965a1df0f10f2d67fda031e2ee8764460134592585a2b SHA512 eb0c10f46c137cf2a98f606b0bd49fbd43920136bde57d445bc2feefd1d1ec57212b651510b9ad6a7ea37cef2d02e004217e136ed10ca23b39c3791162e5d8f6
 EBUILD gentoo-kernel-bin-5.4.242-r2.ebuild 3025 BLAKE2B c020a8ed2bcad22f892c23eb542f36f718aa5238f1a6df070e24794ef21c481971bb149a6542d2f5262a38f6eb3d1f71b6fd059e3e135891b2350580a931c20f SHA512 671535b7ad6cb4ccc70c826fbf9c6dd3a2c4068ed92968fec15add8712201fa41cdf40bd8c3998327c9a5ef0aed42dbcf694ffa9c191395fa75a9fdea367b17b
 EBUILD gentoo-kernel-bin-5.4.243.ebuild 3028 BLAKE2B 022cdf6c0db736314e0bb413422f2267146a7c22273e2149f9f8e85feff555b01e28ca044e875d82eaf4e7cb139ec530561c0ba6122059f3b0be63cfe6fb99ea SHA512 c465e8d904061fea29ed34e83879ccc2dca6f2469caf78c76b44f1a696d2e21a36826c6b3a87d6b581ee12ccf72bb02bf6cb20624a3108ad595d5a59dc92b880
 EBUILD gentoo-kernel-bin-5.4.244.ebuild 3028 BLAKE2B 022cdf6c0db736314e0bb413422f2267146a7c22273e2149f9f8e85feff555b01e28ca044e875d82eaf4e7cb139ec530561c0ba6122059f3b0be63cfe6fb99ea SHA512 c465e8d904061fea29ed34e83879ccc2dca6f2469caf78c76b44f1a696d2e21a36826c6b3a87d6b581ee12ccf72bb02bf6cb20624a3108ad595d5a59dc92b880
@@ -114,6 +133,8 @@ EBUILD gentoo-kernel-bin-6.1.27-r2.ebuild 3025 BLAKE2B c1d1d0b65849cd758cc662dfd
 EBUILD gentoo-kernel-bin-6.1.28.ebuild 3029 BLAKE2B 0fc4d2ca3341d8f5afd03ac7ae09ca1cc6cd9b011660474eb8a2ef077505a610d80e6d77035dec5b92cd934babcee30e591e466b85b36c3aa06e60d7ac74e0df SHA512 75be80e0f233c3f8770165ec7639147a819e670c9c31531fb4a23dedecb0651e40ed7ba6e19b5d606b02d1aa9cfdea2c18af489a84eae83969107233cabf75bb
 EBUILD gentoo-kernel-bin-6.1.29.ebuild 3029 BLAKE2B 0fc4d2ca3341d8f5afd03ac7ae09ca1cc6cd9b011660474eb8a2ef077505a610d80e6d77035dec5b92cd934babcee30e591e466b85b36c3aa06e60d7ac74e0df SHA512 75be80e0f233c3f8770165ec7639147a819e670c9c31531fb4a23dedecb0651e40ed7ba6e19b5d606b02d1aa9cfdea2c18af489a84eae83969107233cabf75bb
 EBUILD gentoo-kernel-bin-6.1.30.ebuild 3029 BLAKE2B 0fc4d2ca3341d8f5afd03ac7ae09ca1cc6cd9b011660474eb8a2ef077505a610d80e6d77035dec5b92cd934babcee30e591e466b85b36c3aa06e60d7ac74e0df SHA512 75be80e0f233c3f8770165ec7639147a819e670c9c31531fb4a23dedecb0651e40ed7ba6e19b5d606b02d1aa9cfdea2c18af489a84eae83969107233cabf75bb
+EBUILD gentoo-kernel-bin-6.1.31.ebuild 3029 BLAKE2B 0fc4d2ca3341d8f5afd03ac7ae09ca1cc6cd9b011660474eb8a2ef077505a610d80e6d77035dec5b92cd934babcee30e591e466b85b36c3aa06e60d7ac74e0df SHA512 75be80e0f233c3f8770165ec7639147a819e670c9c31531fb4a23dedecb0651e40ed7ba6e19b5d606b02d1aa9cfdea2c18af489a84eae83969107233cabf75bb
 EBUILD gentoo-kernel-bin-6.2.16.ebuild 3029 BLAKE2B 892ec1549f7259065d4a5c35cb8cd0b61625cfa6c1e12bc931e17b0dd50498c5980044c6d0e2c1a2952e2841fb7bb0a69f256ec758bce59f1ff2d732b5ee4433 SHA512 d03ad5a6ceccf7ac86895866c120b90b9655ecdd6bb2a69c00a0a0944ae4af5bd4d7bb0fdd20a8583761a8e45dfea8ba12acd778cab3badeabab6445eafe7e76
 EBUILD gentoo-kernel-bin-6.3.4-r1.ebuild 3029 BLAKE2B 892ec1549f7259065d4a5c35cb8cd0b61625cfa6c1e12bc931e17b0dd50498c5980044c6d0e2c1a2952e2841fb7bb0a69f256ec758bce59f1ff2d732b5ee4433 SHA512 d03ad5a6ceccf7ac86895866c120b90b9655ecdd6bb2a69c00a0a0944ae4af5bd4d7bb0fdd20a8583761a8e45dfea8ba12acd778cab3badeabab6445eafe7e76
+EBUILD gentoo-kernel-bin-6.3.5.ebuild 3029 BLAKE2B 892ec1549f7259065d4a5c35cb8cd0b61625cfa6c1e12bc931e17b0dd50498c5980044c6d0e2c1a2952e2841fb7bb0a69f256ec758bce59f1ff2d732b5ee4433 SHA512 d03ad5a6ceccf7ac86895866c120b90b9655ecdd6bb2a69c00a0a0944ae4af5bd4d7bb0fdd20a8583761a8e45dfea8ba12acd778cab3badeabab6445eafe7e76
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.114.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.114.ebuild
new file mode 100644
index 000000000000..83c6a5e4fa8f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.114.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.31.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.31.ebuild
new file mode 100644
index 000000000000..623c8b8ab75f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.31.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.5.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.5.ebuild
new file mode 100644
index 000000000000..ff865204fd12
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.5.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index b2141d49d426..ca8382f8686d 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.15-118.base.tar.xz 4596840 BLAKE2B d33cfad9149f4f80c98c649c52b
 DIST genpatches-5.15-118.extras.tar.xz 3936 BLAKE2B b74dd7b0194cf6881ef699d0b1db858bb8c44780d5263cbf136f9d181a48420ae31886cd762f819a91b21a2f2acb83f3c46b1950dc53367d8efebe8c86a9317b SHA512 1a3671f3abf8ae04afe50639fe27dfbc07f9f51b297effcd587704f88efda801d3df3255f9d04acbdf4bfac9986a2788a54f4e9fe22344aa0166bbc3de260880
 DIST genpatches-5.15-119.base.tar.xz 4664324 BLAKE2B 8d594786237d670753f237a4948f5d0e7a85c9f5762f082fdc65dbdad9bdf84422c110d7da2defa10eb548fb03cf42420d54dba7c8b62d51bd1ae04446294783 SHA512 8cc047640fc20b1cf9a91809f0ab4ffcdc00e69441f52c7a14d411b254f6cd7e6921dc1e037402341dfb443cfc08a3032540dd1fb8c2c5288a15100eaee896de
 DIST genpatches-5.15-119.extras.tar.xz 3932 BLAKE2B fe9680afdaf4153177cbb2380361b18fa252f26a93f57b64e14fd761774596576ff3269bca33fbc6f41dc58d2804e67a664d44167dcd75f8f63c33ff7cc3da75 SHA512 ce0a62af36ef19b6543eaf84491447d65d11bf560ec6db450545b5b88d37552cd3933aed20afb0912e12671fa11de6e5efac6d668f593eac3cc4078d170d3c7a
+DIST genpatches-5.15-120.base.tar.xz 4681108 BLAKE2B 7e69c38991ab3b5ec949f48fff8564c854017b8bafac61747eede20f79d71dade59effaee29fe849b1fdbee7abcaeeeef3f55a39b95b96bda6a70af05a905a68 SHA512 2be319896281e7cab1646da40a3067c3815270ff5fb29edccda9138862a39ace2192a1cd38a4232bc14ebed0d6c0c877a9fd58f225d7cedca743664e2a993025
+DIST genpatches-5.15-120.extras.tar.xz 3932 BLAKE2B fb00b97c8b61234646388bec0dd23a1310a7bdca9d04a2048a32a4e30605662c7001188bc125170aeca2ded63954a71b612908286aeab06928dec00cedc76902 SHA512 c2b6ee91b3505dae7fe78a393001cdf6ac7d0020f8123f14d961b90d1424144996e182fcb5304d5890c041e2d940a960bac0795ebc22e85459285b16f67d9b3f
 DIST genpatches-5.4-249.base.tar.xz 5692112 BLAKE2B 8057ddb24ebbd5ee1b4fb5f5a36b295c4e8ab857e407c5b9e061780e1d23ecca7ab5adfb10ca4f6733a7776c2aa6e353419257c255b07bc991ecb6857aa31555 SHA512 b0057da850ab5368dcbf2b454d408b72204150cc2643e087d2f084c3074de22ce36fa4c319552b90d9059ba279e8dc6551cd6348c3616275b050167bfdb58023
 DIST genpatches-5.4-249.extras.tar.xz 1812 BLAKE2B b6b7bccf77851a17e8b514439a50c44de954ff461af71414c325ca5c0a65d7a79ee92f7a8b708afd28a3433acddd13aa3bbd5afcd82b4181e57ea05b008d7090 SHA512 c4977abc2bbb1c2319e9d2e4aed38419f9e2a70813e5f28d2b799533fc945574d9fee21c881b6dd4926a9c2ebe74ae414ada4993e3fcbd117b6536f983533282
 DIST genpatches-5.4-250.base.tar.xz 5760352 BLAKE2B a0780e42391ad416839c34d85f079f11e9bf1579a293ea1bbdeb95e08e76d1d3f7956fcf9c83eb85223016bd4816d23c87e0b345bcb61b5076e5bbbd42024244 SHA512 8dd686658217cda074e0731c84d3e8c63bfa914b7e607eab28ab46c8cba647591fcd0a726108a08c826290e9edb01f29b6bd135af0991d818666a853764eb11d
@@ -26,10 +28,14 @@ DIST genpatches-6.1-34.base.tar.xz 1760348 BLAKE2B 9a7672bf2f106e0df50997d746171
 DIST genpatches-6.1-34.extras.tar.xz 3808 BLAKE2B 9830d4850e5095ef0864df0aaa25a4549678fb76b22807abf61739b42b048455535aff7eaac16bad5d2cdb0cca65efd2e176a50f40a685250df0b75565fadc36 SHA512 13c8f7f596eeaa9b78be7aae7667a196e199fbb8d3cc045318dfdfe1ab340622fd0e958be09ed8608f9667231d6523685af1f03f4f2b52d78810885c0e9fe4a0
 DIST genpatches-6.1-35.base.tar.xz 1862704 BLAKE2B b6fb58876bf303e807a429d63c8a932798a73f95275ca1137ca672477d8004404f931e09e681c92202fda9083a44dd53dd0b93d1e503f2bd6e177c44a9c10425 SHA512 df18933b2dc32af5a0760c8419d0f69d2c221c4d12aa8c64ec7d38be8407930b79d507f5312d9e9d369a51a192196dd36a8b919e78c81d068f7ea5989be8c8a1
 DIST genpatches-6.1-35.extras.tar.xz 3812 BLAKE2B 3784c4bc551ad594a75de1f174112f80c2e805f5ab2f1fc20642162e72ad785c03ac7e90be19497b6826810d706e36b4f40396e45ba95a6a40f7ba296a3d2930 SHA512 4666ba408cfedbf2d6858fde80699c7d533cf24724598c2b719bed365021eebbad7eb1872008b1bca2f8da77ab31b20d56ead15d9c7d0cd6135f117510a87c89
+DIST genpatches-6.1-36.base.tar.xz 1892196 BLAKE2B 21e7b006889ce39d3b2afaa981cb04c1229050d13b944086ac2c51add6c63dc96c3ac2dda188dfa11a45343904e26589684ffea3a22c235738c1c6d8c38a11cd SHA512 b4de4f6db586a9aafddf639ae914b35ffb0e2340ef312c64a48f4a0bfc02c573437595fc61596245dec2eac7add9f62925e575e2f621d2cf2e80262096f64df9
+DIST genpatches-6.1-36.extras.tar.xz 3808 BLAKE2B ba99390043e4a62ea1322364ba601440fd70079ffb98dea924f91aeb00a7add4d2402e16589e0406e66ff9e0ec7a9d0d76e0a14276fe486507345c8ebeb82bde SHA512 ab4170a7b75c2617ccd5c08b7c5d84e68e593cacdca70dd59ed0b738639ddf3bbbaf6a4758728ff74026478a341782eb0e73a6a40ef9a7158f9c6221703afc55
 DIST genpatches-6.2-19.base.tar.xz 1082064 BLAKE2B a25100f54e9775fb220e2debd088c2d9e822e0c8e80da51f34f2372e2b2ee9a09f64fde4ab63e7b53ff1b6c5c0022d52aa7fb6d023a234ef520b3566bf4055c7 SHA512 bae1c063f9e624ebd935681ec7323b7c4fadecff63c2f4cd21d13731a70b549a4128c59a03e282c502bfd9b631ca6ec876cc782a90f633003dff97fc05c95eae
 DIST genpatches-6.2-19.extras.tar.xz 3808 BLAKE2B cd58fa1bc082b4cc6f45e1d8332921f78ce4eb8356c6510c6df2eac06778695ec98e4f68b6608bb22b66486895340595c13a9b59ed5316b3a6a8d27e86a796a8 SHA512 b69b534b8398ea2cf8578dca763736c6ea071959c37f4c2fcc0ff5ea9f35cee2e88637567979211d242a04f2015fa3ba6765b5e2173a9ab90c69e5d67b02e9c3
 DIST genpatches-6.3-7.base.tar.xz 466812 BLAKE2B 830f25190bad0be6dbfd45ebc748bc5ef6075cb13466f6cec02ba075d1af98d8ed7285506746631bcea71dbab007290c5b86cc8970c02e5aad5bd37d92d4b9c0 SHA512 65d9ecb216c900aec0d265b849fb40f8c141bda2ea4150d93f24f84c33eedf67b8966ff50a4ef65b0a3ea0aeabacacbfab45203c73dc3e83c1f7758d54b8a2e6
 DIST genpatches-6.3-7.extras.tar.xz 3808 BLAKE2B 097c661baa4c4342622cb548169258be534099a9d3d6ec55ebdcccd03f2cdd53ee45bc3e3b96650ffd3d48d667b9a4b8b7ca0d0bc3b0c990b44d1c7d7553d604 SHA512 0ee09931b9e9ad8a3cc266b2c9fe68ce843971d19eecda98765ee92f2ef210b475eea752dd7b44daca61af1b404a28a694dba09f457166e94227aef8661a2780
+DIST genpatches-6.3-8.base.tar.xz 502012 BLAKE2B 190e68ecc877c5520413129ad7d28f8a088775234c18f59f74a4675b1256c7da1d8dc1b323c232523fc3044f3dd4988a77ecacedda715ff3431f910b7b0d58b7 SHA512 02f4b62eb098d875e4c66325f2abc74917fe0d88c1c35ee84ee2a19da878addd27719e9e2a0dca145707335338eedc905407dcd54c6706ec18a2f0920fc082b6
+DIST genpatches-6.3-8.extras.tar.xz 3804 BLAKE2B 461a2a8fd04a4a7ef2f714f5472d2169b4119dbd42bac961feb6b890b8d7def33931ac8dbe423e9d8ee32e60d56ca01bcc4c814c18e445da8d8bbb9b58a6a717 SHA512 fc563f898ee88024d4b60eec567a7439893339c9f51b4eb9a09a0b16b1c7fa164260e63396ea923e776751dfdbd52d2cddace03f212419d4b145e38b5d670dad
 DIST gentoo-kernel-config-g7.tar.gz 4625 BLAKE2B 72ba0d038ee34ca5eb26d43bd373735aef3a50d02b414993ea05485e49d83d46df98a6cb0f6f3170a8ec0c99b557432fd9a11cbb92ff7c2837625a7f4469831e SHA512 2d74a8ca9f5402b4290ed93cd3ddba04a7f2ff42c8d8d3f2cbbe22fc20daa0fca119368daa8af39b7a26b1b99e4e3187c3c5d95886a651675ad94ff98d686628
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
@@ -68,6 +74,7 @@ EBUILD gentoo-kernel-5.15.110-r2.ebuild 3656 BLAKE2B f28fc4c7aac5f5c4f20e0feb600
 EBUILD gentoo-kernel-5.15.111.ebuild 3660 BLAKE2B adfae469fe7d2bc99867375d81d6a157a24d79c6314c41330c9e5460890cfe06e22780d341950f4f2002cab2a72704eb6bbd33d25683e665078b5a47eba6d380 SHA512 b168699de4088c154047829cda497d6f51aec4b56aa1f3f6eb99fc04d01d14c080ae8c5a456cfb0891f5d9477d79be7b38dff28a7040d4e04067f43fd1b246f1
 EBUILD gentoo-kernel-5.15.112.ebuild 3660 BLAKE2B adfae469fe7d2bc99867375d81d6a157a24d79c6314c41330c9e5460890cfe06e22780d341950f4f2002cab2a72704eb6bbd33d25683e665078b5a47eba6d380 SHA512 b168699de4088c154047829cda497d6f51aec4b56aa1f3f6eb99fc04d01d14c080ae8c5a456cfb0891f5d9477d79be7b38dff28a7040d4e04067f43fd1b246f1
 EBUILD gentoo-kernel-5.15.113.ebuild 3660 BLAKE2B adfae469fe7d2bc99867375d81d6a157a24d79c6314c41330c9e5460890cfe06e22780d341950f4f2002cab2a72704eb6bbd33d25683e665078b5a47eba6d380 SHA512 b168699de4088c154047829cda497d6f51aec4b56aa1f3f6eb99fc04d01d14c080ae8c5a456cfb0891f5d9477d79be7b38dff28a7040d4e04067f43fd1b246f1
+EBUILD gentoo-kernel-5.15.114.ebuild 3660 BLAKE2B adfae469fe7d2bc99867375d81d6a157a24d79c6314c41330c9e5460890cfe06e22780d341950f4f2002cab2a72704eb6bbd33d25683e665078b5a47eba6d380 SHA512 b168699de4088c154047829cda497d6f51aec4b56aa1f3f6eb99fc04d01d14c080ae8c5a456cfb0891f5d9477d79be7b38dff28a7040d4e04067f43fd1b246f1
 EBUILD gentoo-kernel-5.4.242-r2.ebuild 2860 BLAKE2B bc1812c00d3f6c58b51d0e9389055a6ca000db0fea5dbdbed392790fefce8a9abb2766c1083c3215c09453d89d6fe9889ffd62b1bf873ff69dfedce41badbf7f SHA512 96e28a4dc569a8d6ae0ea10710db9187a26a448640e76507414031b5ea16ee494a889cbb4a44b9f13cefc9c00d4066a46e8a0887f9fd5dabba5072605d283023
 EBUILD gentoo-kernel-5.4.243.ebuild 2864 BLAKE2B 9c8cfab868459f96ae38c0be597633a33ca73abfbf3fbe6f7e970ebf02874e440b56da5acb8368f54f30b6788b9262952b88c946b36f38dfc11a9a8b54f36f73 SHA512 014eb31ea72d58680b6c5bcadb70439775b2946789ae1a9b478fa8d50355bc834dc09b4cf7357a9ef051b657f5e8bf84a73a839bcc2f86863ec6eec51f053253
 EBUILD gentoo-kernel-5.4.244.ebuild 2864 BLAKE2B 9c8cfab868459f96ae38c0be597633a33ca73abfbf3fbe6f7e970ebf02874e440b56da5acb8368f54f30b6788b9262952b88c946b36f38dfc11a9a8b54f36f73 SHA512 014eb31ea72d58680b6c5bcadb70439775b2946789ae1a9b478fa8d50355bc834dc09b4cf7357a9ef051b657f5e8bf84a73a839bcc2f86863ec6eec51f053253
@@ -75,6 +82,8 @@ EBUILD gentoo-kernel-6.1.27-r2.ebuild 3915 BLAKE2B cdeb40055499aa278517eff23df65
 EBUILD gentoo-kernel-6.1.28.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f864931c42a093a934c9a54d5bab61f84adf8d072a401c36e4f464125756d15373c159d835c8b64da9e68f364dd85360e13b1 SHA512 3e9d6bf7af0ee81645f3fa3410c6fdc5cd06876c952a77e3ae043634b15b3fd6370e83eef8f312a883df87d98dd9b228f7b4d30145b514cfa5037db0fbe6243e
 EBUILD gentoo-kernel-6.1.29.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f864931c42a093a934c9a54d5bab61f84adf8d072a401c36e4f464125756d15373c159d835c8b64da9e68f364dd85360e13b1 SHA512 3e9d6bf7af0ee81645f3fa3410c6fdc5cd06876c952a77e3ae043634b15b3fd6370e83eef8f312a883df87d98dd9b228f7b4d30145b514cfa5037db0fbe6243e
 EBUILD gentoo-kernel-6.1.30.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f864931c42a093a934c9a54d5bab61f84adf8d072a401c36e4f464125756d15373c159d835c8b64da9e68f364dd85360e13b1 SHA512 3e9d6bf7af0ee81645f3fa3410c6fdc5cd06876c952a77e3ae043634b15b3fd6370e83eef8f312a883df87d98dd9b228f7b4d30145b514cfa5037db0fbe6243e
+EBUILD gentoo-kernel-6.1.31.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f864931c42a093a934c9a54d5bab61f84adf8d072a401c36e4f464125756d15373c159d835c8b64da9e68f364dd85360e13b1 SHA512 3e9d6bf7af0ee81645f3fa3410c6fdc5cd06876c952a77e3ae043634b15b3fd6370e83eef8f312a883df87d98dd9b228f7b4d30145b514cfa5037db0fbe6243e
 EBUILD gentoo-kernel-6.2.16.ebuild 3920 BLAKE2B 516c7afc7a60374a3180b08f3137aab1fcdbf9be1584fd1c4326e77cfc09015eb94011b51338688808e01078f2403fe1b4b832edb1dd3909b1521776d7d96021 SHA512 14d89ad101e02742576ed026dfd4bc1eb147a4e9be6cd24967c64cf851068b76f6faa829fce7116cd45a0798ca1e55f51e1e19810291049787c82a42df594d4a
 EBUILD gentoo-kernel-6.3.4-r1.ebuild 3919 BLAKE2B ce36a0c01561205dfd8ae0c201499482c598a9a937585e76b8beb9d9f6f267bec97bba421094afe33633ef4f9e8c649f15276533e48105cfa2d3cb9722780f36 SHA512 de4378b2e5d63ad4bd5f245eb20d9e4cd1e05f35789765cb64f6f316cd2f6e4e74b1503717afaea84bad334ed15c9cfe1e6c69f49814e7008a8f00f71c9cd398
+EBUILD gentoo-kernel-6.3.5.ebuild 3919 BLAKE2B ce36a0c01561205dfd8ae0c201499482c598a9a937585e76b8beb9d9f6f267bec97bba421094afe33633ef4f9e8c649f15276533e48105cfa2d3cb9722780f36 SHA512 de4378b2e5d63ad4bd5f245eb20d9e4cd1e05f35789765cb64f6f316cd2f6e4e74b1503717afaea84bad334ed15c9cfe1e6c69f49814e7008a8f00f71c9cd398
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.114.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.114.ebuild
new file mode 100644
index 000000000000..f45f633a3dbc
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.114.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.31.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.31.ebuild
new file mode 100644
index 000000000000..d77da3bdbc2e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.31.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	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/gentoo-kernel/gentoo-kernel-6.3.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.5.ebuild
new file mode 100644
index 000000000000..fd81855a6140
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.5.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.3.1-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	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/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 2ef24142b2bb..eb0cd6b57a38 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -82,26 +82,26 @@ DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
 EBUILD gentoo-sources-4.14.315.ebuild 741 BLAKE2B 0d3e0e53beb029ef8ad1c3fa87f557da4feeafba4aabd5b8dbe1146a6e27d790b89468d6af429ddda407627e28a271ff322c3993721fa520aa9e09f1bc026398 SHA512 5d30c225d9efd900b8fac43f9c3927ca287a133bb303103dce865dfc0afa05e28af839fbd4f6b07dea9a0259130598bfc8b8527f8bb25a2565ea053977434042
-EBUILD gentoo-sources-4.14.316.ebuild 749 BLAKE2B 332296ebbe510fe76f21bf3d7904d563e637c5e41d2b9934b1d4f49922c4040c897f17d67e54a7a35714010b4b487cb242aceba2604487b5f6cbdc4ef091bdcc SHA512 d16c4384c3156ebd818b36513c8a090f932a86e94b4ee30a0bd02b2f6cda8bc50d450d30e5cc9c0be542aeb9fe60e6ac253443c9d683a2c7a9fa51a9ba561b15
+EBUILD gentoo-sources-4.14.316.ebuild 748 BLAKE2B b64b37b798b8b28e5b08d6bdc4216c811bc8c79d61d971c1adea10680219b78b24a5cc9e651e4709849182e5c8982e9ed091cd39ca230009ee211c8662a289d4 SHA512 fcadd013ad64979e37e44f0935375f4efc4798a441a2fe3b090c243c17b6b7f028bf84b48221b8c902b198984d91a82487a7dfe8ddbcdeecf0775e09edb538bd
 EBUILD gentoo-sources-4.19.282-r1.ebuild 741 BLAKE2B dfd15f2c0a1dbdc663693e64b83f492787c1c344bcd49749dcb660137f5d113a190342acfefc425a4f3e1ffb9bd19e73ed9f85b194ddf732547f2ce5d15149c4 SHA512 78626e6982b5a5a9b3180613677c93d2c71e628bfb6b25f0c3711f01a7ea327c5be7f1294692b53d4a038af6ef37df146377e147b3c09903074654a6f0368aae
 EBUILD gentoo-sources-4.19.283.ebuild 749 BLAKE2B 3a4480b881ce75b7d433c43ffe9f0a82bb09d0e22e94781077ee3295030e6d538facaf33ad4a902113b3658ef6b5fa30482f5ad6511a4a8c958913026e7b3573 SHA512 dbded22a4d01a1b50cabd5a20259d658ce994a044d853f72a056b2f5f41089abb7d7a005a8cf5612d79d4c1fa2594e18d719c116d5fbe14d1e4be6eddfc91049
-EBUILD gentoo-sources-4.19.284.ebuild 749 BLAKE2B a93cc906e1db905e8e1c8ecc9ac98c63a3016957dbcb21a4baaae93190c5ae86a9602f48e4befffebb17a5ef9029c999b12d86d7570d15e68dbaab57db6fe068 SHA512 9a4b60f4851ff0b594406ebfa819a1e89d533483dd04a4d782ca81a30b53ecbde67ae62457d82af2b93313aeb1b4433196bcedce62a7bdd36509a15e853782c6
+EBUILD gentoo-sources-4.19.284.ebuild 748 BLAKE2B 07bbb888a1d88d80873cfc94230152dea1cd300c8688dc7702d4ae69442defe6b1520e9ad108b6128c0b1e6530b341922523b5f118515f4bb7fd929bf0cb65c7 SHA512 9657257d26458fb700b04ee79bf8e6bc12adab302b19915293e36c744beb7c248855aae87028db6b3172c382b78109c7f0fa0f6f198e48c38f962c883557ed12
 EBUILD gentoo-sources-5.10.179-r1.ebuild 741 BLAKE2B fb508b7e4775cf0f4314bc679f7fccef7ec7cca4295b736c47726466106d2f16d25e15128869408d37a43fc9e297361392f3da16e89b322f10001425032260b9 SHA512 1a3ff9bd713b5b2b9e70aa21840dc6784c55f386b79afab991089dd2fa63f3bb180a0eb3612deac530597de8611e1962e4a6ddb4cbcd9dde5a4db0ef14a19509
 EBUILD gentoo-sources-5.10.180.ebuild 749 BLAKE2B f984d6f0054e79f02d6dea50017b7c61609fc5326b186515cf644630f83561873b195621fc6a7dceb20c6e57050162257e05001346165a756bfa0300f48d9517 SHA512 1cec18a831d748d4781737448002b3163c05d8a3d2c2a0760cd89e055aa8c8ffad7253066a328b432f0f10a36f90fe2e15213d6c9284fb8bd83933b341af0801
-EBUILD gentoo-sources-5.10.181.ebuild 749 BLAKE2B 5adab5133810c85cfc63480d8bbc052b0e39879be347249356d1b99e1365bcb6a35aa986e78d3b774527f847d332a607c12ed0634a62a30e347050faf521e9b2 SHA512 ed6b80b379ee5afd55120c68a0c06614d0bc36168c6cb41e9f41320b4d1c3120b34aa904e2b42e969756cdb6d156e265dacb6cbe9b11345b5cba41fb97a30b40
+EBUILD gentoo-sources-5.10.181.ebuild 748 BLAKE2B af4afcd19551dcda65aeb1669e9a94d85c7932358bee65208c63e1fd087c7c2fd2907ca37845856d86b16c79ff56bb7a21ebe93df6116eb03af4cf60385d8051 SHA512 cde8a2723e6cd138fb98df3e3f2c024140cab934cdc893134ceb76b1e4b422f178306cfa1cdfc4d3a95674047c461211a31576811461091c7d2cccdcac2e7027
 EBUILD gentoo-sources-5.15.110-r1.ebuild 741 BLAKE2B 5a642c321566d105efa2faaf1a97399728cee2c5b21327070c91df0c2ee3bd58d25149e92523fec30566bf8294c69e262743e7c433de4b07603dd26e5aaee23d SHA512 440a2aad08da27e16e82f62aba59589ab0c476d5016549504ae902c93d7bd44c4c280da5b0d5817187c13bc7d2e1f79b81e518532241652f69c4ca679d3be463
 EBUILD gentoo-sources-5.15.111.ebuild 749 BLAKE2B b1ad4aad6d6976881895fb32561eafa74a19aa70be1b66eece9a44bae3c820139c67997b1d0ffd79451ce6ab331a3bd901803606b9a3ca30c920348c5fcc332b SHA512 0e159c2e1fa540c50598b18784622db3ec78f45af413253c81fd18cdb9737b540f88339341407cb7240b09e9e0ac2aa815269ac1a3d21f3df3525e1b94681789
 EBUILD gentoo-sources-5.15.112.ebuild 749 BLAKE2B 21c5f6f5403ecd2540cb5966642f56d3ec00a57c5af2b29485ad36f923bc4e9ccac0b5133b2a2703d83d164853f966eecea4d29039cdb23cd8e32406f77fd69e SHA512 716a39ec4a66cd7617e058236269ede2c4860209a91f59e1d17887d13a9cf6a54e97293a6a515b2cad551677edc39254beee6b38bcc79cfee890a386a037572b
 EBUILD gentoo-sources-5.15.113.ebuild 749 BLAKE2B 0fd025f98ba4855115dac3c98c2ba5ad4a987478deb4ffbb7052320e3aaaa64cde2362a6e5e8aa76670a1846ed158e6d1999127838dbd81f08a05ea4609de3fa SHA512 90e14c291d3596bbb40d9c237430163e9decda7b807f62817c5fe46fa8ca3f1884025f7c9874e819dcc8ac6b3142cfbdccdf54a8513980ed77a26580122051ad
-EBUILD gentoo-sources-5.15.114.ebuild 749 BLAKE2B aff3b90fbda69e45f16fa9c4298dae4c70d39695711b4ffa399c04c64149540d7aa3bc952ee5e10fc8a588b8b5fcefdabbdf05658517e1c03c579973a501182d SHA512 bd373585ba18632df659a6cfc4e4b1a106d3229002131f06206b51a2ec98a8f541a2e811efcc6d8a0e074afb71de68d3c9584e918357683f7537f42cb4464c30
+EBUILD gentoo-sources-5.15.114.ebuild 748 BLAKE2B 30e9c9b7218a7d40ca2118b01f8f88e0fa075731f7df20a0c28bcbf759e79e4737c854428084b1429b74fa39ea501834a088cdf4562dc0f256c1df9e95f46f14 SHA512 0f9b7b3e98643fbf5923b550f3216281d7cd2ffa5b561a59da405d781a80c303d8fea80ef093e303f315a969342c21c7a9269674aeb5e9b3172b1fa58c3d8464
 EBUILD gentoo-sources-5.4.242-r1.ebuild 741 BLAKE2B 969fd0e5ab40e4d7ddf184b73ee9cf90a0a0aebbf109c87370e9e20096866a2febecd25cb8bae29441b1b1a5ede7c4d185ac1a9450d2c12621ce7c02803b146c SHA512 8ab1fb1c47918b9f26220eec306cc86941e5d24ae2bfd404cd7389505190d179bdc4d94534d769dcaeb7875a4c0e0235ab201498787767d2e98a841451b79aaf
 EBUILD gentoo-sources-5.4.243.ebuild 749 BLAKE2B 7a09e0139a1191df95f24d1cc37036a3572151ef399d300afbd18451d4cd409ed809edfd1014c74161bd78413e18d90b6f0029dd75971d27990f3de022ef97f5 SHA512 b7da7fc0243718ca73188453231a625dd9117b5212d6e280bae1a6f4b7782a448269458f6b201dc3bfeb43a2407a10e8faac9b4f59c1062f0a70cffb2b6b208b
-EBUILD gentoo-sources-5.4.244.ebuild 749 BLAKE2B 7cb62f220325876f6e15cbf453016d495e73eebaa5d3f4f430d553f243b13a5cb2fc1b87375648833fc0a955ed19164850b44decd8be65aa3bb3c44c0a5753af SHA512 b32e8d988e43863cc2a5ff8930b076155d00bb9c26b6a91e9e11a32dd3952da0ac04ac2ae4c12456a00306543f7fa5600842e75d7a980e1ce21cf450acad1999
+EBUILD gentoo-sources-5.4.244.ebuild 748 BLAKE2B 0ec701888759f7ae5e89b98e9239d1108bc38712cbbb3a368599e38c1403ae1fb83f7589bce0170c898a11d563533ba5bce6c9a4bbcfabdfd8fda751e05eaa1b SHA512 b1ffbfac3e3db3b85944931262b63f2faf6a83f717b729bde074255faa2736a1f11fd87064f82490ac15d5292b306688b9bbf61a723ef868e8a6dd4f5d0f42f3
 EBUILD gentoo-sources-6.1.27-r1.ebuild 740 BLAKE2B 1e16f1b1b5333d6ea03c8f1752f303b58e738b001348f74e1410a1dca5cd00be46394e2193499a929c4b035418ca2bfc60ed869e275b3dd73504ce85121a734d SHA512 f52d179289527543fce8fbedb32d0b86487c7dd9c91ad33d1aa74835f29c4b5c45e5d1afa28b62739424a3362ff642523d65e50101e76524285a569b4241092e
 EBUILD gentoo-sources-6.1.28.ebuild 740 BLAKE2B 4b1da14b1c14f7d9ff1a8a361ace2535debefdf84700081104248321e0cd9e8d9b905055136b7130cdc0c92dcadb0b28df86de4b0802f1f4249819d530b3bfc0 SHA512 6823f5401720c11b7d6061aacd302c46fa704c090f6979c61d8f93d72f9442a753d12a1bc3c29bc8a4b6013428e0e22b6fd39c8d1334335e457faa8cdd12884c
 EBUILD gentoo-sources-6.1.29.ebuild 748 BLAKE2B c63537aaea6f33d4c54eb5498e85a0326df6d569b2f3e037efd563e77da2b3a720c8eef37c8ddcde10eadfda2faa22b3105a87988d0e14ef6c240291f9afdfa7 SHA512 3eec5bbf40edfd70095fc340a5f9a0a71677b9384cb83ac996edcf3434f6b445716c4673374f3d46be1cfc5a8ba7fbd6966e9bbca0ace807ac01961346e5f180
 EBUILD gentoo-sources-6.1.30.ebuild 748 BLAKE2B bbba902525c0497fd9dd734f990eeee6e8c07624435ed430e0143a225469642ef39e1210880929832876364bf67be4e5bd8901e6f8aa639b2537dc98c72ba910 SHA512 c0ddcdf309ec037c8a4b4891a28999ae76cae4a7c9a0ea27fa0c1e6bf266064c2354aefa010cfb711fe80fd11e2acaa1badf1fd89d479ac42330b20ece3c3ab7
-EBUILD gentoo-sources-6.1.31.ebuild 748 BLAKE2B a6755401b35e352ab5c99cead30e6bdc632bc7192cda098d0b2cc051611820893988dfa97fafcee8798dd549fd7486fc1dabbf98d1b06a162595f1ba3572e213 SHA512 767e658129c9ef787e2c813bfa3cbc5ad97e72a42cd1565c42a9ce56db269435a2de5ba6a89bd5fd9b2587b3806887a81ee867180a0391606f6882b5a6680dc1
+EBUILD gentoo-sources-6.1.31.ebuild 747 BLAKE2B 2caab7136e661d9b094d75a9cadbfc7cc070a9d566371926f5439b3803f25662ea7f3dd40611e386e76519003888b0fe44ca6cfd19b884760d08da7245481991 SHA512 4a2e2c9e2e4a54a343f5548f447e88c7f942b0d18ed6f027c73735d05986a5e9d0635271c5c87d58660ff6ab31dce88a51b3af62f1ae6fc9b63c872d05da5563
 EBUILD gentoo-sources-6.2.15.ebuild 755 BLAKE2B e56e040816859f2757b1233989d513933e61aca86c20d64eb16fc0d54c66953f76c5f6e93f31189691daab31c01e752a70799b4f1671b7a3ddc0097fc1e8ca5b SHA512 b292eba4190e16e939be7963ba735c501fbdafd1714ce91f469e26bf2604cd82e28cca153bd9295bac0ccffb78b8a11044bd184c849b8e9c765065ebb68829aa
 EBUILD gentoo-sources-6.2.16.ebuild 755 BLAKE2B 4acd18c5179ccae29755d6ca2cc9d6161d4529f48bc49e8f066516f5159fd4074f76922154d381ecb7ae0a761a83652c17c1b79fb6095e6fd8c3c8753874ca05 SHA512 a3deb2c012ebaa2cd65977033979acfef7dd3db0f9dfd1c57d21aea9f91d17f87dca3836f701025e5d8add1f414efa5a341b4053f8adb123fc29efc329360ca6
 EBUILD gentoo-sources-6.3.4-r1.ebuild 754 BLAKE2B 6c29df2e5ad945ab7d3c73de5584f939998b15e5cfe5442625a64cca9c5ea14b4e0a4299a6039eb21a0339491e969ed31d29063bf02430ea4e03c19cf790f0ea SHA512 712451df4909566d1c909c8ec6ff3de997c7feae3726dab9b679d381d86230cdcb0cc44ef7e12e0f8fb399efee9384212cb8eb5c6df20e72ac7e408691b84016
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.316.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.316.ebuild
index c9e4c3acaa06..a62a8b95221f 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.316.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.316.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.284.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.284.ebuild
index 7086e07b2759..3adc8016ded3 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.284.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.284.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.181.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.181.ebuild
index 55b47d530ff1..375a9cea62cb 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.181.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.181.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.114.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.114.ebuild
index 77cd7a1e985d..d25e2ac122fb 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.114.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.114.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.244.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.244.ebuild
index b34da5183568..d176194ffb45 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.244.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.244.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.31.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.31.ebuild
index 3b3d46d43c72..e0370534cf6a 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.1.31.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.31.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 0237199fba5c..e7317030ef68 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -41,6 +41,8 @@ DIST linux-5.15.112.tar.sign 993 BLAKE2B a4cde229d2e9ca63cc9a6295866d3ba21b17557
 DIST linux-5.15.112.tar.xz 126518660 BLAKE2B 10867ced55615163d3d719cbfc9193a185099bb062fbb33849763a1153ce6be8c063bdcdaa96b1e64704f43e23c2abd87f874c0ed4266e6eb40a185aae681bf7 SHA512 5e9f444c3f17480eb7b783cfcc0d3a8526c0d2c0e0928043e15bc75f3f9c402fe42f8df8fd4231cb965c71512e1c5a34400081ce305b288d0a4a979c9186e0c4
 DIST linux-5.15.113.tar.sign 993 BLAKE2B 45807aca09b119bd3784a037c2d36df8ef6d1c8c8c9bc8973b5aa4e91aba237b4d9f07318e68a9443d6df07398c0a908486ca7f4a5091d5728b4ddb7ef07057f SHA512 29a6bf4675715ca0e2814712bcbc8cfcf57f20988355c88f2e1f864a571c8b8a8e56b0972e0b4e32eaec71378b2268301740a443bdd9328e40b1070f65be3f1b
 DIST linux-5.15.113.tar.xz 126528360 BLAKE2B 073d8b9d7ceb6e843182e26b3fad7586afbb29cf7a7ff16ea2d5cd41172d4e1d3729b6460230fd0ade24fbfc8eb8f0b93a11c5665727bf4b356e5f6bfb1198c7 SHA512 d4ee0aafc6532408a33ae556c521ff58eabd2fb39021e07ca343893788db2147aca4de81a3e27a9cb049b9b6afdf5bba65e6f6bfcde4dec5a79e68613ec8c939
+DIST linux-5.15.114.tar.sign 993 BLAKE2B aa910499d419072a092b7183cda7ac15a34d128a0b84aabd7e2ec3ce692819c1bb403973167f8640a1abd53f091cb9808c108a246849d08d59d32a650646dc3b SHA512 d5365a0738d6b950506787e1a321deefe9c728d34678cf88d984ea324950f92e0fcb6cea64e87f284a549edac36b8c0a1eccf6321334c4ef430102ff9c748f52
+DIST linux-5.15.114.tar.xz 126540708 BLAKE2B bc4a7b2f928219186e81d04d1eaa46f0976decd53112c4f01a4c698fbf7897686e02ad09ff8695e3337934824c254ddfed6ec76c66c30ec6495f4aab7fce8cd1 SHA512 2fd0a4143592f989663301f5f5d34df0ce6cca66c0c262abe2926e942739b3bb4b7a4faee0e446f6e3ef52fbf2a756cabd8cc8b18a3243c269349a1e6399218a
 DIST linux-5.4.242.tar.sign 991 BLAKE2B 4dfb18636791da74779de3c55aa8a9491549567eb50a408f4a8a77d3d0d8e94a572b85f245fdc28362b557783b3ad804fd81c114c52a1df7919e47296def6a34 SHA512 632e7ef33bfae1595c8bfe375fdb836becfd03346c1ee4b46c503756eac0dd47f92d9a559887207e76ed54f1003a3e3ba92b9db15c645aacc2f941939c578baa
 DIST linux-5.4.242.tar.xz 113000620 BLAKE2B b3d2ab4c1ac9aeb3d7ab7d34b5fc71097fdaa947317f52ffd8c2630d07314b94db33747bb2046818e086ad5b82fe64566900433c60a7837e15a4f405cd0f44a3 SHA512 7b4b55b696fd134b720ab7d0253c7ffbaa7284e5d6fa89b3af37e8e2a98d927fa508e28bcbae1937acfc3d795be38017f1991898c83d116ea2e9af99e82664ce
 DIST linux-5.4.243.tar.sign 991 BLAKE2B c289f3171230e343848ac748ad345c2082e0ff6e289b83eeedc4ee7a3c510cfc59dd3c8b2afeea60fb1aeaa305e60006ac5526ebf75c4d0d85820e3004891eeb SHA512 ac49bd40f185da3ef1c5ed1e6342603a147664fb5f89ca567a37675d8b3b4b08ff47f01de095e0453424447070338635c8cbff4ae84aab0d30d35d0be294ba16
@@ -53,10 +55,14 @@ DIST linux-6.1.29.tar.sign 989 BLAKE2B 05e26bd99c7d5f7a61d83f5b438f342c9a1bb1cb6
 DIST linux-6.1.29.tar.xz 134881816 BLAKE2B b6cf62bc9f1a9120f04857911e2a8fcf3fc5416f55b7d7bc61ded730941220f6f3202d1a86e14dc9f38f6dd40ef7614d52126d9089ccd0cc1eda144df6b102ba SHA512 be078b38ea343b8bade634aa3c75a0f8aaf70964c5ead73d658a0f1a07ca541de5e7b68fca2ede0638773d345a0c7d89c4d74709bb1101e844f3babc1c14b83f
 DIST linux-6.1.30.tar.sign 989 BLAKE2B f1c605f30fb3a85882e59c6d2a813518da804bdd10ab3d6c243915231b2600000944d5f52e102b920f86bc8fd46aff10610e877c411ac01b4336bae13a1db270 SHA512 2afa5bf3b3ae52b1f5ad74520f23c1c33138c7e9f39c47b2be819beb4711b15fd9ce5a57d1b8937ed596cde69e5d30d2916dd2e9c1f70b157e33e4e6ce8c6be0
 DIST linux-6.1.30.tar.xz 134914908 BLAKE2B d3c4cda0bbd978ad7e39a44e03789f38b7a48a92405312f90fd944a670ca438e1dd212af2b075820896b25405027be92071dbd24455331de742aa5c9f2ac3407 SHA512 0bec5dc11cc591191c1265ecb823283c026fe44f1843f18316df9a8997836ed1aa45817db8167a60b28325a639c866cdb28cd1aa00335d4338bb6bc613e50b50
+DIST linux-6.1.31.tar.sign 989 BLAKE2B 86b86704f8e01a31c70a607d572a9ec2d1014cdecb321cb1b7fac56410692697f018c6237e77cd2aad6f53758f27e8177e39065e73dd0f274d4047c4f80e6c30 SHA512 f9488296d96f54490c8a506df7018d4804725b102959b070bd0c9bc64c7ea2d517d4f39273b4ecbe975ba75d712fbf9fe0affa4159546712fc4f0f9c1bf5c3c0
+DIST linux-6.1.31.tar.xz 134903408 BLAKE2B a3eec74aa6313f387d22a57d72737cae6c5e60125596fc265c0f7bd90bc95b6f5ef5192028802995a3cb50e739be328711046aadf3adc93dd2047e4b439d4a01 SHA512 1202a47f29eb17ee074ce22289c6cd488acc381a59968728aedb6070874917cf331a2535629775f5ed3c442b5a82ceb17ed41804e719c2d3f81bcf249261bc7b
 DIST linux-6.2.16.tar.sign 989 BLAKE2B 1e61250c6fb0c9d2e2419a16748b85cb804ef039f70e3c4b4f558fecb83c62eaf7c80d5c25692082e1da2d9efa6d47aab80a44445f4422b0f73c5b081a76cb82 SHA512 026b58ce329173e9bcd0203c298be1d2b095b3370d4e97b4a7b342323a615de48a6cc7ab9b4f5c4a2dae6d23d0c773ac545ef1aaa1f1e445c01eedaf24bf6661
 DIST linux-6.2.16.tar.xz 136509012 BLAKE2B 3357159d25bdd7ac95db7830e22be35e7f8b746673474b3050baea73e90e52e42a4723e6c19242fcb26e579bf52040ab726317fd74a85c37f722653e60ea4e61 SHA512 7f98d8ee2417272e2ab1517f6b7150f74033622e24a9426fc924c75aea46ab22b8ec8c73fc2523378fdb80f8899a3c6a55036a20dd30e438c1d6d39ea036f2c3
 DIST linux-6.3.4.tar.sign 987 BLAKE2B b61e9860c2fdd710bfec1b71a4d6bf96fd905ab52d40c3d9e0f0237297488d48b1ddbcc6c59cd048aebf4ea3f3fe701d5ad44309be82ae99136c66fd1f2b54b6 SHA512 d21eb8559aaa66e8dc78f2e5bb9434eae89a208d50af9f945de4979195a0aac4ee0c0018867a2d6ed5ed1d3e14830e750b7a3c87d3eccb3c40e5b10fb7a0cbf9
 DIST linux-6.3.4.tar.xz 136914364 BLAKE2B 7e287378e007ce83092c2630d87d5e2b77e1615386a275013f04a190c6cab129e5ddc3abf8213ae521c8722d41cb8d203bb5cc5ae84d9bcd20aebbbc2db1d8a3 SHA512 f9d07b728e66c5da3ef0deec9432e2ca1e56d1fb5d98d2e1cb7cf23744fbf837f41fe918de7842410eab0d89ecf213f0b76db925e4c5bfb265e263eeea24436d
+DIST linux-6.3.5.tar.sign 987 BLAKE2B 34ed1d758eb42af9d27b6aec986c9f52426b19ad9a7483d1b4eb1b4873e7e10efd9c102fa7e17d1fba5df15ba536ab77e6597b607dd07ea9012860fe9eff2c34 SHA512 a701dea5d297c217eb2b497a9441399c0f386f39f74f726f81872f8144d83973ec02ce533b7d48cb9c49d38a98c820668d684927983a001f7a8a27067f605867
+DIST linux-6.3.5.tar.xz 136926988 BLAKE2B 646a94591eae93db9301a11e5300579c8cce7d2a544727cb88efed86d05ba070a247498d9c83d7b7cdbead4e7d46537134c877813aa7f188dd36b403c58d0c11 SHA512 91a98c56191645c4ba32f657da59b6be92021b37a698eaf79e1ed3a79b959626386e7b69c8cb0c9eab0645c287a3e53393b1710158eca67b2f66a8d3eaec13de
 EBUILD vanilla-kernel-5.10.179.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
 EBUILD vanilla-kernel-5.10.180.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
 EBUILD vanilla-kernel-5.10.181.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
@@ -64,6 +70,7 @@ EBUILD vanilla-kernel-5.10.9999.ebuild 3295 BLAKE2B 191d46975c539cc082db84ee88fd
 EBUILD vanilla-kernel-5.15.111.ebuild 3776 BLAKE2B c24a30442a8b2fa704c58bf31061467f8f077ace3721ebae232fd81639e95def5bd06c950f73b5823f9d2667cef4f31f24ccf8d308d1b1b480ba4af7a794179c SHA512 aebfea3cc05d1af79fdb155328d54c5d9beaa86259c543b3b24f4b11115cf7c9b6e433aede426925eee67cd84524eafb223c3e75e32380b22cb630e750475054
 EBUILD vanilla-kernel-5.15.112.ebuild 3776 BLAKE2B c24a30442a8b2fa704c58bf31061467f8f077ace3721ebae232fd81639e95def5bd06c950f73b5823f9d2667cef4f31f24ccf8d308d1b1b480ba4af7a794179c SHA512 aebfea3cc05d1af79fdb155328d54c5d9beaa86259c543b3b24f4b11115cf7c9b6e433aede426925eee67cd84524eafb223c3e75e32380b22cb630e750475054
 EBUILD vanilla-kernel-5.15.113.ebuild 3776 BLAKE2B c24a30442a8b2fa704c58bf31061467f8f077ace3721ebae232fd81639e95def5bd06c950f73b5823f9d2667cef4f31f24ccf8d308d1b1b480ba4af7a794179c SHA512 aebfea3cc05d1af79fdb155328d54c5d9beaa86259c543b3b24f4b11115cf7c9b6e433aede426925eee67cd84524eafb223c3e75e32380b22cb630e750475054
+EBUILD vanilla-kernel-5.15.114.ebuild 3776 BLAKE2B c24a30442a8b2fa704c58bf31061467f8f077ace3721ebae232fd81639e95def5bd06c950f73b5823f9d2667cef4f31f24ccf8d308d1b1b480ba4af7a794179c SHA512 aebfea3cc05d1af79fdb155328d54c5d9beaa86259c543b3b24f4b11115cf7c9b6e433aede426925eee67cd84524eafb223c3e75e32380b22cb630e750475054
 EBUILD vanilla-kernel-5.19.9999.ebuild 3415 BLAKE2B fccd59b033a2c78ed80927aef1fb8c2e56ac60ae94cdc29569ab038af25d7d4a3234e978eb5ceb63f4527a2ec65682ea1a7fec076a3f63ababab520f3ccd1889 SHA512 7e7d154e927d8617e9fac062242388cd5372632cc9d7fb9183315d5ab2e0e116ce3531cc9965ed132b911a72bd956969ab9bfc39f999805b82a96a3320d3d7d4
 EBUILD vanilla-kernel-5.4.242.ebuild 3062 BLAKE2B 57f0ff3da486dcf8c18cd11607ac6835b7dadd1d792c2499ff6530f0a28a017695ef9ef6e7a0fc15d31b857bfa0359694572cea594cf1a473d639ebb55ff0e58 SHA512 a7c2010a4ac27038d55adc11bc2f5340015266b60f61d93d41fbc20346fdd5ac624673fd08da709d5a144b78ff6a46f28cfc94663f627e0a87ea97db24cb7f42
 EBUILD vanilla-kernel-5.4.243.ebuild 3062 BLAKE2B 57f0ff3da486dcf8c18cd11607ac6835b7dadd1d792c2499ff6530f0a28a017695ef9ef6e7a0fc15d31b857bfa0359694572cea594cf1a473d639ebb55ff0e58 SHA512 a7c2010a4ac27038d55adc11bc2f5340015266b60f61d93d41fbc20346fdd5ac624673fd08da709d5a144b78ff6a46f28cfc94663f627e0a87ea97db24cb7f42
@@ -72,6 +79,8 @@ EBUILD vanilla-kernel-5.4.9999.ebuild 2635 BLAKE2B 16aaff3ea21368478a85a6bb93cf7
 EBUILD vanilla-kernel-6.1.28.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.1.29.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.1.30.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
+EBUILD vanilla-kernel-6.1.31.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.2.16.ebuild 3895 BLAKE2B f7fc8005962105282e53712b62e7b9171f1f2822d1399729ef9308bbe1148b770e43f3596ed345c00ab48bdb0089b340047ab55d329fa1e8a8ac3dbc161382c3 SHA512 59ae350b9f9148ce275d17006890467413242c39a7dfde8ccabbb59afa3c2d94aed27a51f063ccd948703b621f0985b819d1031552eb28b6f03401841f173d9b
 EBUILD vanilla-kernel-6.3.4.ebuild 3894 BLAKE2B acee4c86bce7612f272ac8ec0f47fbe08bd4cc6db499989c6d8fae38be3ee95c2c4f3666b395506a31f3a5b83745f58f3a7ed0516a97215ff94310342eb3300a SHA512 00e190e1ca517847c6123e2cfd18196c20b032f0c4a49ba66331ac969b120500ca2856d31b97082ed86195f9280980ba8ba52005839105c4056022902e86d4d1
+EBUILD vanilla-kernel-6.3.5.ebuild 3894 BLAKE2B acee4c86bce7612f272ac8ec0f47fbe08bd4cc6db499989c6d8fae38be3ee95c2c4f3666b395506a31f3a5b83745f58f3a7ed0516a97215ff94310342eb3300a SHA512 00e190e1ca517847c6123e2cfd18196c20b032f0c4a49ba66331ac969b120500ca2856d31b97082ed86195f9280980ba8ba52005839105c4056022902e86d4d1
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.114.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.114.ebuild
new file mode 100644
index 000000000000..f68caf0fd433
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.114.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs 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=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.31.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.31.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.31.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.3.5.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.3.5.ebuild
new file mode 100644
index 000000000000..98a956be057f
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.3.5.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs 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.3.1-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 38cc416ba970..0f4e4dbee5ef 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 8ad72599c6aa..888b23c1d522 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -153,15 +153,23 @@ DIST ncurses-6.4-20230429.patch.gz 9195 BLAKE2B 6ed8c3cac11d3c3e52b7dce20be5b769
 DIST ncurses-6.4-20230429.patch.gz.asc 729 BLAKE2B 2e063a7818ac443182ec4f4d8da13884accd563ab66e04297ca0bd4b9610f974efd3ca29dfcf13939cd9ee369c5e5799eb13a55050249036ebbc375e6ef8d6d1 SHA512 55167510e21aa3ad6d4a57fa37ae82308424ae9141e6e4756b4b335d30136675add5c00ee102d74ed93eccfc2d752eff5045d88e708928df3cecde3c0be77c79
 DIST ncurses-6.4-20230506.patch.gz 52834 BLAKE2B 55d2351a507a60aa5baeb9e7e392fbbf714a6bffcf4729e9b195aabc2dc81372336d0dc3501f95abda04491013220060983d2186531471694f40b35d4ef3196d SHA512 04967b96d9723b2939fe64eff4388ceee0adf478f659b58cac8601770dd7763fa192d673e78b33c267e00f4ecbfc2863bc49b12fcdeaa8ce24df39126f20b4e1
 DIST ncurses-6.4-20230506.patch.gz.asc 729 BLAKE2B 5ccb09f5b48a4a9c98ad4224cde68df659a365aca12210ec14a6519216e32b10531b1dfc4184bd12e62e1f0fdd9f06974b59866bba6115407d52712f5adff6f8 SHA512 2f63a62e37a15aa6a276a5d9a2c4b86a4e50af037ee5b1c339bccb02200d3e477b5b93ce5833a4d3933a952970caec3b38639412281c1df7c30d7b241bc3a2ab
+DIST ncurses-6.4-20230514.patch.gz 42963 BLAKE2B c2d27883884ebb2f14c523b5558d575b84fe8aa6b110a4f246f529d29288118d8393a955d8401aee675a764d52e76495d47487f52c3edb8548dc3419371def49 SHA512 0346fae238637c6a69024982485672e6b1447f5902d9cc6b9deff8296220a381b5b41b23b30d053881b09242a4e8ad728618342300c1dee63770286b81e362df
+DIST ncurses-6.4-20230514.patch.gz.asc 729 BLAKE2B 10ee649be87b46a03d1cb1c31a57ec9cb20da425604900540d04f806cc2c9e9a1e73009f62a96fafdbd81d66c7d47878e256d02cf5b9de9ee6f26621b73a4705 SHA512 57875d11844efbb23052e5cee32aa41a0bddb290069e33504e57613e4ab131efddc9c85f92af82b1d6bfa00182bcb9f1e86812538f5f209096b3ee84c67de280
+DIST ncurses-6.4-20230520.patch.gz 3090 BLAKE2B 93e376bc6250509c1a83e799efc2d4766354451931115d300b74c14af93dda4f3aefdd59f97467eb88e6ea29804595e84cb62c62733022b255d5368a74a38729 SHA512 bf854e4d6f8ed643b8841c9265057f06186699a083edb489e970d1cc8e752fdf49ecaa36518340a2b00a5c6ebf548b7651361b1bd2abb80467d2ce3f9861d28d
+DIST ncurses-6.4-20230520.patch.gz.asc 729 BLAKE2B 08db3a1a8152c4cc29fcc11b24ec3d1a6d3c425eed9a54f33bc370b86f26a13a9cdd273652c448e6e4dd179f5ca41ae653f7ef44902a10eaa18828e2be3a6247 SHA512 7bf2aa9442bc5041ce316af7edc2ff5c5da2ab1bf941c26c6592c8785dc0e47539da3bc2c1e570daafb6a293812f55b8b3b327f90ff9908984eba37e89d5eb7d
+DIST ncurses-6.4-20230527.patch.gz 9787 BLAKE2B 951a53b87056f2b3b530f03d0bab5a06ecf6bae0bf2fb580af8c0d96ae169e4813ed2063bf1696fd0fcc1cb0f7da03348904818de7ce454cbcb9a42bb939b6b8 SHA512 f600d7bdbde1f0752d3d530ceb98e9ba51a246a3bd898cc0d0d65bb8b51dab68fa5668789f5f86473c28eb890ec62cecf8e4dc901ac96fccf162c1a5f161f897
+DIST ncurses-6.4-20230527.patch.gz.asc 729 BLAKE2B 472421bd7c9093a293e99ec0f343ed471a77e7aa7f705cd99bb61f907c7059b134158c176fb232c542842ba042a1a88ca8e192df81d2d760a70f26a4d76ae624 SHA512 74a0ae5123b339c00f786d4d15a6c100d5d323731b7534e495dd396c9fd03b7ebc61d3fdf6eb71f2fa106160e15da5d093af6e4d53b4a6cfc53c436045a5a614
 DIST ncurses-6.4-patches.tar.xz 63720 BLAKE2B 6b767f65a9c7e8f9fdebaa2623e3770872e710fa103d11e48509e5315ebf5ad1a37519b1b40c5138e631693fb2e2e30ea5eef11002698a341a623a85c5b0b4fc SHA512 5094f6cb8fa54d9df0802173f1e0ff2ad40fc3d4bd298c0742479f72ba4f9afee0ccf9f0a4eb068b0a5552523abf7b212861b61abbde6f69ff22d62dd686daa9
 DIST ncurses-6.4.tar.gz 3612591 BLAKE2B 47fd9c2d27f44fa9942552881a471e5067465dbace40bf68b28998dded0556127a1d8662b96de4de4fd76c1c8b98bdae796036553ab4b05ca9f160839d841ba3 SHA512 1c2efff87a82a57e57b0c60023c87bae93f6718114c8f9dc010d4c21119a2f7576d0225dab5f0a227c2cfc6fb6bdbd62728e407f35fce5bf351bb50cf9e0fd34
 DIST ncurses-6.4.tar.gz.sig 438 BLAKE2B e6a78b8d0cbce1577205b49b0260394094632cefd95294813c7e4e51a2908e8599a9f24b3b648e42ba16c015fb9424b2a82236f58aac3bf96f5400a50482e44e SHA512 f2a7859725b4d5d62f68006338d56598ac6b38a1448983108906e192f0ec922be287cc89bcc79c1ae49ebc80c967af3dd077427f35ae579b00d445c882414fed
 DIST ncurses-6.4_p20230408-patches.tar.xz 80472 BLAKE2B 0ba8156ebd4f1691fec7bc1b800ef39ce6a4210573c027dd437919cdcd7c995830116da06c69f31c65923845a4d5c88e974673fac38acce5813f7d6cdc646e3e SHA512 32960e2cc4cd9dc60c38b49f46c5ce2c02179479abb66ca29f63cd06475ae8e26299a78b5f06762d114aefbbca3ba6fbebe7093a58106eeaa40cf500d21633a4
 DIST ncurses-6.4_p20230424-patches.tar.xz 63080 BLAKE2B 3924b22d60d995766987a217b960b4c719a51f7334c9be80d19c0df4615e1f9c657507e77124cc8f5663249cbd480cac6570fdd49362a12e2fb69fcae8c800e8 SHA512 188b4da6d75cd15397977a07789ee6365262bd392fb7b2714e870834b2195d29fc5aadff6664a9a13d8d73e88aa43f502ae97c7b1f980231ce392a05ed4d3eb7
 DIST ncurses-6.4_p20230506-patches.tar.xz 63132 BLAKE2B 5067aa5f82ff9c9ffad0cc9effc1990095b808a1c76ce1ad640aef39f896ed3f1a81caf000cbdb355a2f213133d877bad949ca14debeb88b2d0d3c3a8331e605 SHA512 cef883f486cf5b2abecfd951e408aeeb76257b53abea465b33b0e9f4b9bd9b7dc001f4aa48dcbd429143ed14b784bd841bcd5bc722d528d21521d5630dcf8315
+DIST ncurses-6.4_p20230527-patches.tar.xz 63080 BLAKE2B 9db4ac28c8936d3a9c6f3ca5cb8a4c92aa79ee4ce49789bcfc9c031a0454bf6f55a0544bc4a3dbb5c243ed9b2d0792afb98622a6a14b11675b7988100a650eb5 SHA512 3eacda173e8a177cd201ca3fef65311ac92e7e5af4039dc8a5792beae7db1d37efd06f5a55c249eebb771d1245995ff3a206a45794936b6b4299151666dbeade
 EBUILD ncurses-6.3_p20221203-r2.ebuild 13799 BLAKE2B 76fd3bd7a051f7b43423498b1174d68cad7dec3049edc43b1ea1027622d91713d9e08f8a631ed7944e5a62feada261ea967df3f44afdb3f1e1532fec320af5ce SHA512 e61968d5618f12b1e75911646e97aeff820fbd00c48dd0d8c92d8a1ef4cbb3d21700f44e6d466f14d033d704c11d11b307c93fba55e6eec55fd55c53252ef29d
 EBUILD ncurses-6.4.ebuild 13055 BLAKE2B 6064dd6f45e0a3854e7f53647ee3a6a8f9e7d0ca5326d9788a7a6a570d4b9f58b295d6ff5b3b9b0b725752d9afedae5132c03203d51b0e868bbba8eec2793c0c SHA512 57306ce9c1ef23661a81e39406669c063a9e773a26eb43af48d72b7ceed300fc03b4b174678ccfc9d5f2432d655fe02c0a26cdf48a501d322c18d4db48c9ad0f
 EBUILD ncurses-6.4_p20230401.ebuild 13133 BLAKE2B d3f185d211e963223366560a70bfbf81c74aebe854dc67b224f0475f338fe9c4a5e6d226fd7f1e851ffd832ccf5118c3208b6b4eed125ed1f601ad4841b9d386 SHA512 64da8236a3fb8bd3c145b63a81bc34114dee8b7faafe0ea4f4b33b893e1656ab212e7c40e872b132aa46488ca8e93a07049c0e49fc91da55a800c09cd962d502
 EBUILD ncurses-6.4_p20230424.ebuild 13196 BLAKE2B c60604211cfe1b032071ec2bc77784c468edde4b60cbc37f725cec82a297249550ac963a5266b47b6bb1962bc6739f0e7273cc406688b047f72549bb5109aebe SHA512 9257eaf910fee8e8860f1721a5b6cc88bbfd139d4776a3a7884fa5e2ad5ed4b453a715159e139484bfd68839dc7c69d936b40185060c05b6cc0396dbace47942
 EBUILD ncurses-6.4_p20230506.ebuild 13343 BLAKE2B 365aeafe24d09c7020f5b4d561885f860c4c7aa1a0f59101865111252b6d3e9dea5034439851151a92bdb26a7e33e303928499c291021476e3b8280da21e3b3c SHA512 bae2072c674e3345cccb5fcfbfd78838852e13e847961a03eb12534e90701cda0dbac1a7827a0341a659affe6caa4d129ec39f96ce5ae1350e1a3ab8141b9bb1
+EBUILD ncurses-6.4_p20230527.ebuild 13376 BLAKE2B fac349fc116981a68f1fa38c064a91e3ae1d6a3754e3e3a8597ebcc40ba65940e67d580fe6d025c310769990f04bbc995d4cc83ec1060490d7bb3b9b941dd3db SHA512 a8ecbb165f1f1ff06a19ce2de5fe7ea10a8a408a4ceb6b4a51dc613e9ced07e6dd970c492e9df089b52b2d8c8927ee17ada002bf277e22a70f5ee1c20a5f87d1
 MISC metadata.xml 1094 BLAKE2B a65bbb9584f77fb07fff735e6471ef48a5d63e7fa79112bf75df67f2f94e816706165fdd42a482708a7fd2ab3b3e308f9766eac0b39c3a4e31dcff5b3db25d57 SHA512 adf0f939a1e14c964bfb44ab80b1b8c1ee897a036a994848ba3e40280ab3a73ddb3beef540c905efd623e71b890c4c91e0b7c24651561d0e2bb2a4c86f039dba
diff --git a/sys-libs/ncurses/ncurses-6.4_p20230527.ebuild b/sys-libs/ncurses/ncurses-6.4_p20230527.ebuild
new file mode 100644
index 000000000000..7f0aa8fa0754
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-6.4_p20230527.ebuild
@@ -0,0 +1,437 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# sys-libs/ncurses-compat can be bumped with sys-libs/ncurses as upstream
+# provide a configure option for the ABI version.
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript verify-sig
+
+MY_PV="${PV:0:3}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Console display library"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/"
+# Keep invisible-mirror.net here as some users reported 403 forbidden with invisible-island.net
+SRC_URI="
+	mirror://gnu/ncurses/${MY_P}.tar.gz
+	https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz
+	https://invisible-mirror.net/archives/${PN}/${MY_P}.tar.gz
+	verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )
+"
+
+GENTOO_PATCH_DEV=sam
+GENTOO_PATCH_PV=6.4_p20230527
+GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches
+
+# Populated below in a loop. Do not add patches manually here.
+UPSTREAM_PATCHES=()
+
+if [[ ${PV} == *_p* ]] ; then
+	# Sometimes, after releases, there's no megapatch available yet.
+	#
+	# From upstream README at e.g. https://invisible-island.net/archives/ncurses/6.3/:
+	#
+	#	"At times (generally to mark a relatively stable point), I create a rollup
+	#	patch, which consists of all changes from the release through the current date."
+	#
+	# Also, from https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html,
+	# the patches are considered to be acceptable to use after some testing. They
+	# are both for development but also bug fixes.
+	#
+	# This array should contain a list of all the snapshots since the last
+	# release if there's no megapatch available yet.
+	PATCH_DATES=(
+		20230107
+		20230114
+		20230121
+		20230128
+		20230211
+		20230218
+		20230225
+		20230311
+		20230401
+		20230408
+		20230415
+		20230418
+		20230423
+		20230424
+		20230429
+		20230506
+		20230514
+		20230520
+
+		# Latest patch is just _pN = $(ver_cut 4)
+		$(ver_cut 4)
+	)
+
+	if [[ -z ${PATCH_DATES[@]} ]] ; then
+		SRC_URI+=" https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz"
+		SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz.asc"
+
+		# If we have a rollup patch, use that instead of the individual ones.
+		UPSTREAM_PATCHES+=( "${WORKDIR}"/${P/_p/-}-patch.sh )
+	else
+		patch_url=
+		my_patch_index=
+
+		# We keep a bunch of mirrors here as we've had reports of invisible*.net
+		# being 403 forbidden for some users.
+		urls=(
+			"https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-%s"
+			"https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-%s"
+			"https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${MY_P}-%s"
+		)
+
+		for ((my_patch_index=0; my_patch_index < "${#PATCH_DATES[@]}"; my_patch_index++)); do
+			for url in "${urls[@]}" ; do
+				patch_url="$(printf ${urls} ${PATCH_DATES[${my_patch_index}]}.patch.gz)"
+				SRC_URI+=" ${patch_url}"
+				SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
+			done
+
+			UPSTREAM_PATCHES+=( "${WORKDIR}"/${MY_P}-${PATCH_DATES[${my_patch_index}]}.patch )
+		done
+
+		unset patch_url
+		unset my_patch_index
+		unset urls
+	fi
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz"
+
+LICENSE="MIT"
+# The subslot reflects the SONAME.
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace"
+RESTRICT="!test? ( test )"
+
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+# Block the older ncurses that installed all files w/SLOT=5, bug #557472
+RDEPEND="
+	${DEPEND}
+	!<=sys-libs/ncurses-5.9-r4:5
+	!<sys-libs/slang-2.3.2_pre23
+	!<x11-terms/rxvt-unicode-9.06-r3
+	!<x11-terms/st-0.6-r1
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${UPSTREAM_PATCHES[@]}"
+
+	# When rebasing Gentoo's patchset, please use git from a clean
+	# src_prepare with upstream patches already applied. git am --reject
+	# the existing patchset and rebase as required. This makes it easier
+	# to manage future rebasing & adding new patches.
+	#
+	# For the same reasons, please include the original configure.in changes,
+	# NOT just the generated results!
+	"${WORKDIR}"/${GENTOO_PATCH_NAME}
+)
+
+src_unpack() {
+	# Avoid trying to verify our own patchset tarball, there's no point
+	if use verify-sig ; then
+		local file
+		for file in ${A} ; do
+			if [[ ${file} == ${MY_P}.tar.gz ]] ; then
+				verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig
+			else
+				[[ ${file} == @(*${GENTOO_PATCH_NAME}.tar.xz|*.asc|*.sig) ]] && continue
+
+				verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	# bug #115036
+	unset TERMINFO
+
+	tc-export_build_env BUILD_{CC,CXX,CPP}
+
+	# bug #214642
+	BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
+
+	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
+	# Order matters here -- we want unicode/thread versions to come last so that the
+	# binaries in /usr/bin support both wide and narrow.
+	# The naming is also important as we use these directly with filenames and when
+	# checking configure flags.
+	NCURSES_TARGETS=(
+		ncurses
+		ncursesw
+		ncursest
+		ncursestw
+	)
+
+	# When installing ncurses, we have to use a compatible version of tic.
+	# This comes up when cross-compiling, doing multilib builds, upgrading,
+	# or installing for the first time.  Build a local copy of tic whenever
+	# the host version isn't available. bug #249363, bug #557598
+	if ! has_version -b "~sys-libs/${P}:0" ; then
+		local lbuildflags="-static"
+
+		# some toolchains don't quite support static linking
+		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
+		case ${CHOST} in
+			*-darwin*)  dbuildflags=     ;;
+			*-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
+		esac
+		echo "int main() {}" | \
+			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
+			|| lbuildflags="${dbuildflags}"
+
+		# We can't re-use the multilib BUILD_DIR because we run outside of it.
+		BUILD_DIR="${WORKDIR}" \
+		CC=${BUILD_CC} \
+		CXX=${BUILD_CXX} \
+		CPP=${BUILD_CPP} \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
+		do_configure cross --without-shared --with-normal --with-progs --without-ada
+	fi
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	if [[ ${ABI} == x86 ]] ; then
+		# For compatibility with older binaries at slight performance cost.
+		# bug #616402
+		use stack-realign && append-flags -mstackrealign
+	fi
+
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_configure "${t}"
+	done
+}
+
+do_configure() {
+	local target=$1
+	shift
+
+	mkdir "${BUILD_DIR}/${target}" || die
+	cd "${BUILD_DIR}/${target}" || die
+
+	local conf=(
+		# We need the basic terminfo files in /etc, bug #37026.  We will
+		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+		# src_install() ...
+		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
+
+		# Enable installation of .pc files.
+		--enable-pc-files
+		# This path is used to control where the .pc files are installed.
+		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+
+		# Now the rest of the various standard flags.
+		--with-shared
+		# (Originally disabled until bug #245417 is sorted out, but now
+		# just keeping it off for good, given nobody needed it until now
+		# (2022) and we're trying to phase out bdb.)
+		--without-hashed-db
+		$(use_with ada)
+		$(use_with cxx)
+		$(use_with cxx cxx-binding)
+		--with-cxx-shared
+		$(use_with debug)
+		$(use_with profile)
+		# The configure script uses ldd to parse the linked output which
+		# is flaky for cross-compiling/multilib/ldd versions/etc...
+		$(use_with gpm gpm libgpm.so.1)
+		# Required for building  on mingw-w64, and possibly other windows
+		# platforms, bug #639670
+		$(use_enable kernel_Winnt term-driver)
+		--disable-termcap
+		--enable-symlinks
+		--with-manpage-format=normal
+		--enable-const
+		--enable-colorfgbg
+		--enable-hard-tabs
+		--enable-echo
+		$(use_enable !ada warnings)
+		$(use_with debug assertions)
+		$(use_enable !debug leaks)
+		$(use_with debug expanded)
+		$(use_with !debug macros)
+		$(multilib_native_with progs)
+		$(use_with test tests)
+		$(use_with trace)
+		$(use_with tinfo termlib)
+		--disable-stripping
+		--disable-pkg-ldflags
+	)
+
+	if [[ ${target} == ncurses*w ]] ; then
+		conf+=( --enable-widec )
+	else
+		conf+=( --disable-widec )
+	fi
+	if [[ ${target} == ncursest* ]] ; then
+		conf+=( --with-{pthread,reentrant} )
+	else
+		conf+=( --without-{pthread,reentrant} )
+	fi
+
+	# Make sure each variant goes in a unique location.
+	if [[ ${target} == "ncurses" ]] ; then
+		# "ncurses" variant goes into "${EPREFIX}"/usr/include
+		# It is needed on Prefix because the configure script appends
+		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
+		conf+=( --enable-overwrite )
+	else
+		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
+	fi
+	# See comments in src_configure.
+	if [[ ${target} != "cross" ]] ; then
+		local cross_path="${WORKDIR}/cross"
+		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
+	fi
+
+	ECONF_SOURCE="${S}" econf "${conf[@]}" "$@"
+}
+
+src_compile() {
+	# See comments in src_configure.
+	if ! has_version -b "~sys-libs/${P}:0" ; then
+		BUILD_DIR="${WORKDIR}" do_compile cross -C progs tic$(get_exeext)
+	fi
+
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_compile "${t}"
+	done
+}
+
+do_compile() {
+	local target=$1
+	shift
+
+	cd "${BUILD_DIR}/${target}" || die
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.
+	emake -j1 sources
+
+	# For some reason, sources depends on pc-files which depends on
+	# compiled libraries which depends on sources which ...
+	# Manually delete the pc-files file so the install step will
+	# create the .pc files we want.
+	rm -f misc/pc-files || die
+	emake "$@"
+}
+
+multilib_src_install() {
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+	done
+
+	# Move main libraries into /.
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a \
+			"${NCURSES_TARGETS[@]}" \
+			$(usex tinfo 'tinfow tinfo' '')
+	fi
+
+	# Don't delete '*.dll.a', needed for linking, bug #631468
+	if ! use static-libs; then
+		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
+	fi
+
+	# Build fails to create this ...
+	# -FIXME-
+	# Ugly hackaround for riscv having two parts libdir (bug #689240)
+	# Replace this hack with an official solution once we have one...
+	# -FIXME-
+	dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
+		/usr/$(get_libdir)/terminfo
+
+	# Remove obsolete libcurses symlink that is created by the build
+	# system. Technically, this could be also achieved
+	# via --disable-overwrite but it also moves headers implicitly,
+	# and we do not want to do this yet.
+	# bug #836696
+	rm "${ED}"/usr/$(get_libdir)/libcurses* || die
+}
+
+multilib_src_install_all() {
+	local terms=(
+		# Dumb/simple values that show up when using the in-kernel VT.
+		ansi console dumb linux
+		vt{52,100,102,200,220}
+		# [u]rxvt users used to be pretty common.  Probably should drop this
+		# since upstream is dead and people are moving away from it.
+		rxvt{,-unicode}{,-256color}
+		# xterm users are common, as is terminals re-using/spoofing it.
+		xterm xterm-{,256}color
+		# screen is common (and reused by tmux).
+		screen{,-256color}
+		screen.xterm-256color
+	)
+	if use split-usr ; then
+		local x
+		# We need the basic terminfo files in /etc for embedded/recovery, bug #37026
+		einfo "Installing basic terminfo files in /etc..."
+		for x in "${terms[@]}"; do
+			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+			local basedir=$(basename "$(dirname "${termfile}")")
+
+			if [[ -n ${termfile} ]] ; then
+				dodir "/etc/terminfo/${basedir}"
+				mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
+				dosym "../../../../etc/terminfo/${basedir}/${x}" \
+					"/usr/share/terminfo/${basedir}/${x}"
+			fi
+		done
+
+		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
+
+		use minimal && rm -r "${ED}"/usr/share/terminfo*
+		# Because ncurses5-config --terminfo returns the directory we keep it
+		# bug #245374
+		keepdir /usr/share/terminfo
+	elif use minimal ; then
+		# Keep only the basic terminfo files
+		find "${ED}"/usr/share/terminfo/ \
+			\( -type f -o -type l \) ${terms[*]/#/! -name } -delete , \
+			-type d -empty -delete || die
+	fi
+
+	cd "${S}" || die
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	if use doc ; then
+		docinto html
+		dodoc -r doc/html/
+	fi
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libncurses.so.5
+	preserve_old_lib /$(get_libdir)/libncursesw.so.5
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
+	preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 7e82737fa3a2..4741a2e9aa1d 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 1b2b997e1c5f..a7837fd920fa 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -5,6 +5,7 @@ EBUILD dist-kernel-5.15.110.ebuild 399 BLAKE2B a864eaf52c6d073cabeb88a64ec5b20bc
 EBUILD dist-kernel-5.15.111.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
 EBUILD dist-kernel-5.15.112.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
 EBUILD dist-kernel-5.15.113.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
+EBUILD dist-kernel-5.15.114.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
 EBUILD dist-kernel-5.4.242.ebuild 388 BLAKE2B 74ec9dad235bab972e849e0e63809fd44ebf07f15209f9528694016b0e456aed1d5406810e882b1632cd99bea780e92c040e3cd61a16b79a4aeeeed1226fc3d5 SHA512 5caae3c3baa9607bb90971cebd958b9792e4596201433cb9727da362fd4c521dfdba8d559ad7d23021e4e221da8ac27b4d04a33dc01cc7e3397321d739f2f572
 EBUILD dist-kernel-5.4.243.ebuild 392 BLAKE2B 23e7307e3b46e1823a981583dc446eac90be56b46e0a4e8cc1a921d15e5fd3856a3c471c3a53a546c29e597fab22e16bfb511b7e5ac543923c8708db34ffd453 SHA512 dea200ee38d46c859203a4acafe41a505e860d8353a63a4c6629df091a022bfd1f9c5d3bc9be57e31fc823d952a5425651e0a98bb65b55d78edea0d73915e7c1
 EBUILD dist-kernel-5.4.244.ebuild 392 BLAKE2B 23e7307e3b46e1823a981583dc446eac90be56b46e0a4e8cc1a921d15e5fd3856a3c471c3a53a546c29e597fab22e16bfb511b7e5ac543923c8708db34ffd453 SHA512 dea200ee38d46c859203a4acafe41a505e860d8353a63a4c6629df091a022bfd1f9c5d3bc9be57e31fc823d952a5425651e0a98bb65b55d78edea0d73915e7c1
@@ -12,6 +13,8 @@ EBUILD dist-kernel-6.1.27.ebuild 406 BLAKE2B d2a57d03473571929e7e2e0b24ab0de1a16
 EBUILD dist-kernel-6.1.28.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.1.29.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.1.30.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
+EBUILD dist-kernel-6.1.31.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.2.16.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.3.4.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
+EBUILD dist-kernel-6.3.5.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.15.114.ebuild b/virtual/dist-kernel/dist-kernel-5.15.114.ebuild
new file mode 100644
index 000000000000..407f5d349eb1
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.15.114.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.1.31.ebuild b/virtual/dist-kernel/dist-kernel-6.1.31.ebuild
new file mode 100644
index 000000000000..d3f0fa8764cf
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.1.31.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.3.5.ebuild b/virtual/dist-kernel/dist-kernel-6.3.5.ebuild
new file mode 100644
index 000000000000..d3f0fa8764cf
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.3.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index ad905df34996..525fa0b5b1da 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 87dc9e0531f7..dab8fa2d01ff 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -11,7 +11,9 @@ AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d620
 DIST lighttpd-1.4.68.tar.xz 1030612 BLAKE2B 5682194a9e124598daf22bca56826535ac48f1c89087238f2a455cd4cb0f12287ce79ab5a7b6ca966003772335e6a14d484658300e401c098b4e87a7207198c4 SHA512 137cf62e3c7b07d1dc4af50318f1ec67bbf60058ad1a4fef0b1c94668916e23cfcdf85fe9cd728163e55c1b21f4831b9ab922fcf6b6ba8e2a03b2f73a9694189
 DIST lighttpd-1.4.69.tar.xz 1045516 BLAKE2B 4b9c15bd69db5afcf40c3df41831d2fcecbb4149a8cfef582e7dfe80328d515a1021baa32c17e0f89d81c9726dbbe8480d9d319684d38a11961b28d2d0224e9c SHA512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f
 DIST lighttpd-1.4.70.tar.xz 1070048 BLAKE2B 3f2e56343e4bf6904babadf5b1a879e44b598f6ae3b3abe9260c47ae72bdc9424fed55104646caf5fb35b0ae8cb084b1eba694a3e18a7c9c76e08e3cd8802a19 SHA512 50a4b9e3ded2c40ad6c2f4d0dff8b89d412a839ba2e6eb0d9310c344adfa7c2067f3220f666b81fc0e1a1efafa222f5bba00f91b5925f55fddeacc2304837a21
+DIST lighttpd-1.4.71.tar.xz 1070904 BLAKE2B fa039ca7877050b4720c815c4bd164ad0fe7e367e4302b8e0a3ab92654a2169ded0b0a42209ca1a0561b5090670e8a8d71b594c65c439a8d03a49685405dae2a SHA512 c1388b563b9cf9dcab0a57bec42b09b2cb5e1932bc137ae5f957d1bf3932ddd8f5f188002a7b9a00f0a92ba3779b21ecbea2ccffa91e686b6660c9cc455d6598
 EBUILD lighttpd-1.4.68.ebuild 6134 BLAKE2B d3f37d71841a1100922d6eb2bb8dca791c225696d104c573c764dc237e57d6d0176d2ae7b648743e4fc815b15ba0edfdb7ae6e82015a26f784a27ff7dae0203b SHA512 711c6376bb1bdb3784faec233f2efdff5bcd4be9e33bce41a07232c074d6d7ad479ff22697b7b0cccbc799ac8a82946942ff85215b5be82392f4491555fa31c9
 EBUILD lighttpd-1.4.69.ebuild 6073 BLAKE2B 0200efd5b8c15c5d13bc07cfac28920f525fe52abfa827810f4bf7a489b0326b07d5805952e144a9a1b9f3da151cbcfeafe65932bfcd5686493bcf897db7669c SHA512 efe1edc84ccb2cbfce2a6c65893c8bc8ad6b0f4c749c55bb106b35ecdd43a80d967eb19b8788b4a21cc30dba0e126db38b72070eab7acd3c6fdf472a214cccb7
 EBUILD lighttpd-1.4.70.ebuild 6076 BLAKE2B a7839c7b76ebf861d3c02202d1622ae790eb3242ce5cf01b57d0726c92b690c3fc2b55cc415ce51ce77186b72cb3318f887c889ff5271761d4338cd8c6bef4bb SHA512 ac7e2031314135e8b80f97aca63e8f5306d4cd666633f55ae1fa97c3a326edbc54de275cd0124d2acbdda598f6c79a759aa33b68660b1be81facf2792a21d523
+EBUILD lighttpd-1.4.71.ebuild 6076 BLAKE2B a7839c7b76ebf861d3c02202d1622ae790eb3242ce5cf01b57d0726c92b690c3fc2b55cc415ce51ce77186b72cb3318f887c889ff5271761d4338cd8c6bef4bb SHA512 ac7e2031314135e8b80f97aca63e8f5306d4cd666633f55ae1fa97c3a326edbc54de275cd0124d2acbdda598f6c79a759aa33b68660b1be81facf2792a21d523
 MISC metadata.xml 1964 BLAKE2B f579b748ff30526597b77536bc6431ae08f340d1fa3fbc142b4668978bf8982bef21ed6975d89ef0cc8446b5a54a962c9bc2d62529f42da9642495ae58032918 SHA512 54b3c0a182c3eb48aa80d079738ec57b885115864c082f4c9c026273bf43893e222c24263e09a3bda4cf154264b064bd079dd9f4083fdb86c4529971208c259a
diff --git a/www-servers/lighttpd/lighttpd-1.4.71.ebuild b/www-servers/lighttpd/lighttpd-1.4.71.ebuild
new file mode 100644
index 000000000000..d8c68c6d4ed0
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.71.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit lua-single meson readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
+SRC_URI="https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite +system-xxhash test unwind webdav xattr +zlib zstd"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	mysql? ( dbi )
+	postgres? ( dbi )
+	sqlite? ( dbi )
+	webdav? ( sqlite )
+"
+
+COMMON_DEPEND="
+	acct-group/lighttpd
+	acct-user/lighttpd
+	virtual/libcrypt:=
+	brotli? ( app-arch/brotli:= )
+	dbi? (
+		dev-db/libdbi
+		mysql? ( dev-db/libdbi-drivers[mysql] )
+		postgres? ( dev-db/libdbi-drivers[postgres] )
+		sqlite? ( dev-db/libdbi-drivers[sqlite] )
+	)
+	gnutls? ( net-libs/gnutls )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-2.1.26:= )
+	lua? ( ${LUA_DEPS} )
+	maxminddb? ( dev-libs/libmaxminddb )
+	mbedtls? ( net-libs/mbedtls )
+	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss )
+	pcre? ( dev-libs/libpcre2 )
+	php? ( dev-lang/php:*[cgi] )
+	rrdtool? ( net-analyzer/rrdtool )
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( >=dev-libs/openssl-0.9.7:= )
+	system-xxhash? ( dev-libs/xxhash )
+	unwind? ( sys-libs/libunwind:= )
+	webdav? (
+		dev-libs/libxml2
+		sys-fs/e2fsprogs
+	)
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	zlib? ( >=sys-libs/zlib-1.1 )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-apache )
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( virtual/perl-Test-Harness )
+"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+	local config="${ED}/etc/lighttpd/lighttpd.conf"
+
+	# Enable php/mod_fastcgi settings
+	if use php; then
+		sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die
+	fi
+
+	# Automatically listen on IPv6 if built with USE=ipv6 (which we now always do)
+	# bug #234987
+	sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die
+}
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+
+	if ! use pcre ; then
+		ewarn "It is highly recommended that you build ${PN}"
+		ewarn "with perl regular expressions support via USE=pcre."
+		ewarn "Otherwise you lose support for some core options such"
+		ewarn "as conditionals and modules such as mod_re{write,direct}."
+	fi
+
+	DOC_CONTENTS="IPv6 migration guide:\n
+		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dmoduledir="$(get_libdir)"/${PN}
+
+		$(meson_feature brotli with_brotli)
+
+		# TODO: revisit (was off in autotools ebuild)
+		-Dwith_bzip=disabled
+
+		$(meson_feature dbi with_dbi)
+
+		# Unpackaged in Gentoo
+		-Dwith_libdeflate=disabled
+		# Obsolete
+		-Dwith_fam=disabled
+
+		$(meson_use gnutls with_gnutls)
+		$(meson_feature kerberos with_krb5)
+		$(meson_feature ldap with_ldap)
+
+		# TODO: revisit (was off in autotools ebuild)
+		-Dwith_libev=disabled
+
+		$(meson_feature unwind with_libunwind)
+
+		$(meson_use lua with_lua)
+		-Dlua_version=${ELUA}
+
+		$(meson_feature maxminddb with_maxminddb)
+		$(meson_use mbedtls with_mbedtls)
+
+		# TODO: revisit (was off in autotools ebuild)
+		-Dwith_mysql=disabled
+
+		$(meson_use nettle with_nettle)
+		$(meson_use nss with_nss)
+
+		# Obsolete
+		-Dwith_pcre=disabled
+
+		$(meson_use pcre with_pcre2)
+
+		# TODO: revisit (was off in autotools ebuild)
+		-Dwith_pgsql=disabled
+
+		$(meson_feature sasl with_sasl)
+		$(meson_use ssl with_openssl)
+		$(meson_feature system-xxhash with_xxhash)
+		$(meson_feature webdav with_webdav_props)
+		$(meson_feature webdav with_webdav_locks)
+
+		# Unpackaged in Gentoo
+		-Dwith_wolfssl=false
+
+		$(meson_use xattr with_xattr)
+		$(meson_feature zlib with_zlib)
+		$(meson_feature zstd with_zstd)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Init script stuff
+	newinitd "${FILESDIR}"/lighttpd.initd-r1 lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
+
+	# Configs
+	insinto /etc/lighttpd
+	newins "${FILESDIR}"/conf/lighttpd.conf-r1 lighttpd.conf
+	doins "${FILESDIR}"/conf/mime-types.conf
+	doins "${FILESDIR}"/conf/mod_cgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.conf
+
+	# Update lighttpd.conf directives based on conditionals
+	update_config
+
+	# Docs
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config/lighttpd.conf lighttpd.conf.distrib
+	readme.gentoo_create_doc
+
+	docinto txt
+	dodoc doc/outdated/*.txt
+
+	doman doc/*.8
+
+	# Logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
+
+	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+	fperms 0750 /var/l{ib,og}/lighttpd
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	readme.gentoo_print_elog
+
+	if [[ -f ${EROOT}/etc/lighttpd.conf ]] ; then
+		elog
+		elog "Gentoo has a customized configuration,"
+		elog "which is now located in ${EROOT}/etc/lighttpd. Please migrate your"
+		elog "existing configuration."
+	fi
+
+	if use brotli || use zstd || use zlib ; then
+		elog
+		elog "Remember to clean your cache directory when using"
+		elog "output compression!"
+		elog "https://wiki.lighttpd.net/Docs_ModDeflate"
+	fi
+
+	if use mysql ; then
+		elog
+		elog "Note that upstream has moved away from using mysql directly"
+		elog "via mod_mysql and is now accessing it through mod_dbi. You"
+		elog "may need to update your configuration"
+	fi
+
+	elog
+	elog "Upstream has deprecated a number of features. They are not missing"
+	elog "but have been migrated to other mechanisms. Please see upstream"
+	elog "changelog for details."
+	elog "https://www.lighttpd.net/2022/1/19/1.4.64/"
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index f74a5d8c3e40..1d266c117990 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 8551ca531995..bb8a176fab7e 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,13 +1,10 @@
-DIST xterm-377.tgz 1527178 BLAKE2B 0e7436d3eae4264d4974026b3e26588cfeb2d6e630e01cdfb9158ade4b9376754c832cffc59be88861469c461ace19ec2ecd9f808ac52cd967301502ec5ccc6e SHA512 e74fef6edae3162a7395e5654e78afcb3cb816dbfeabf46dacab48ed872a7aa7ee8c2be32f14a67d51bc207a2bc914cdc9b446985aed73240086e2320127f7c9
-DIST xterm-377.tgz.asc 729 BLAKE2B b20e862876e093c270a4cdc46b47414c2fb4eb36b99867c3c93d31f785b92ebf90918053dfa11f999da091f2d2ce6326068f2e0acc8055f768e1be39d6a89d75 SHA512 4f93e969053aa3d7f568c7dbc05cecb19d60fb6b5f54c305ea0727f1a11796f882530a403dbec6f9d5d916a43719bd2b62179510e7f6083972ea37b2837af4d2
-DIST xterm-378.tgz 1529140 BLAKE2B 73524a7e382c5e69122432927f9facf525981258df04ac06bd181b9ca8ccddc6387903922a28d17a0d2e8d35c0f459f76fc8aeec9eb43dfd1123cd4f7b1a080c SHA512 71515ecde2f050c17613f5851d00893326338dc31bd4db6a737792d2848d807c8d82ae9c49f8f673150b042c065d5b2a44da8d0cbcdbffbf55fe0919a1ee9047
-DIST xterm-378.tgz.asc 729 BLAKE2B c12827b98ce4a498fd7ae7b223391c6f7193a5f85709bbc2758499db02405f618fab80c2fba21b48181f2330eccd08cd7201fab3671ea239f01b3749d18a7bd5 SHA512 c7e1845375a0bbd477ae78e4449cd2b16206669f042733acf527057dfb3f58582f26d81509383f312cd4f37043ae3754131412ae63571320c4b9fdb00da11c86
 DIST xterm-379.tgz 1531901 BLAKE2B 29691ccf4c84c9ad3d42e0f0fdb082d46425ccd3831d169b40cb16b82118f8a946ad3ea898c409c135531f50fedd0bc7c1aa27ade236918f28f93db647fee313 SHA512 69ec8fd7d425e934010543a4e6afcbec273ca1b0fafad3076af37d65fe369d6e0c5b3683003c1c41f70404d50a3ca1e826c98ee1b3ab0ab12dff22d0cb00a98b
 DIST xterm-379.tgz.asc 729 BLAKE2B 45a4dbfe5a0ee1a3b3f41ae5d5f422038b297d29e5806869f6e2ae604606c935efad3e1d6422869fc1025b516e13a13c5f9e72822a03ede842970cb142be5528 SHA512 e5146f28b30231de6d56072da31ffabe93233032d782c6dcc213517a1c33898b7ed8bbf99f33f866024084956d3ea234eacb8dd9890b4b5ab6554dc3c4a50351
 DIST xterm-380.tgz 1537369 BLAKE2B ef4114ef3e9a2c731839689f62a7aab9549302c4d86467b778260f9ca8edecb1d0785a24291c9499e5044bd42d61ceb4e50b1d99b9b532f60c0617564750e56c SHA512 cd901298af8df5f2eb5ee551d8810ac18a6b6298b29070529675af60b8aeaab05f78aaf9a13c22b88591b1e1ad7190d62dc10b9a59bbbfd884d1a436c9375dd4
 DIST xterm-380.tgz.asc 729 BLAKE2B 1dda140314e7f08c961f697f0fa17454d4dab2c909b3b21203503ee295ac17aa91b91c27eff38b81586b89ccbafef543cface7f6c600e62f89a9c35a4dbde4a6 SHA512 c3ce95c6b93daecab419b50c4bdb5576599ba1ba291e24217264ff88c42d6c46bb91d10bdb8b990168814c5c771bfe2b4e2879e2ce9d279cab73baac6c2addad
-EBUILD xterm-377-r1.ebuild 2923 BLAKE2B 19dba7f16c7fc600cf62d4117795727e6151a97e8e9d1b2c549ff99d983bbe4502a0984f0f98a5bd00c1d58b8f50f01308fe51b2d610725fd7368f833ca2e562 SHA512 a100938b7c97751b4064a2b0db5363d85fad53c42fd0493484541ee34974fc13a6215687cee0d908f096ac241189fa04aa6c9d9e4b0b2136f2867eb5923424d0
-EBUILD xterm-378.ebuild 2923 BLAKE2B 19dba7f16c7fc600cf62d4117795727e6151a97e8e9d1b2c549ff99d983bbe4502a0984f0f98a5bd00c1d58b8f50f01308fe51b2d610725fd7368f833ca2e562 SHA512 a100938b7c97751b4064a2b0db5363d85fad53c42fd0493484541ee34974fc13a6215687cee0d908f096ac241189fa04aa6c9d9e4b0b2136f2867eb5923424d0
+DIST xterm-381.tgz 1536598 BLAKE2B 44a94e893fa8696e58e7246c2800799ca85b4f099f059e62b9f6af98793ba0106e90003d961c318d67efbbd3dcb249f7449e9936aeeb789153f456479485891a SHA512 8cfcfc1f5c5404bcee56265765e489db676838fed6c3182fcc078c55952d6ac76835705d2fa414098fb7e373acb6229f0f5b44150a43844990c58d69cdeec591
+DIST xterm-381.tgz.asc 729 BLAKE2B d6b866eb09c42dea4956bc6997f752b3a59ae0477275e5919abd9420d151cc094cc99b06088026991d76f254bc84f637dd67dc9191870cf88ba9f48a5d74651b SHA512 05217da892f6b6261c33359b1905b97b0164bbbf155be4e516cd624e5afc9dfa8b89a46f1ae302c7ed486ad466c19200becda556c35fa09fd6a932b634cb9b10
 EBUILD xterm-379.ebuild 2923 BLAKE2B 19dba7f16c7fc600cf62d4117795727e6151a97e8e9d1b2c549ff99d983bbe4502a0984f0f98a5bd00c1d58b8f50f01308fe51b2d610725fd7368f833ca2e562 SHA512 a100938b7c97751b4064a2b0db5363d85fad53c42fd0493484541ee34974fc13a6215687cee0d908f096ac241189fa04aa6c9d9e4b0b2136f2867eb5923424d0
 EBUILD xterm-380.ebuild 2930 BLAKE2B 6bb426538a1dec8b3cc0f161c7d4171f88d44c2ad4aa23707f3cf7c5783d5a6c120e20b25d5ea024d0c948cd94b0d6ee5d88fdb503b7220f2ba4565f3c3e8e1d SHA512 5ad65ecefa828c2d1e5aefc1da96d326d6a1a433e77f2958726c2cccc95aa1e0ab7106381d93de0f5a6256f7a912461388f994aee5efaed8b7444558e924663c
+EBUILD xterm-381.ebuild 2930 BLAKE2B 6bb426538a1dec8b3cc0f161c7d4171f88d44c2ad4aa23707f3cf7c5783d5a6c120e20b25d5ea024d0c948cd94b0d6ee5d88fdb503b7220f2ba4565f3c3e8e1d SHA512 5ad65ecefa828c2d1e5aefc1da96d326d6a1a433e77f2958726c2cccc95aa1e0ab7106381d93de0f5a6256f7a912461388f994aee5efaed8b7444558e924663c
 MISC metadata.xml 552 BLAKE2B 1de52230aa9b681cee30dd4ee4651521bf9474cb2a99168fd6c8f13e0918cf185dbddd3dc6f97e0c81118680294e9c4d74137378763b021a07d8ce0a1430e18c SHA512 019a08f2f03a270da7a33bf1b0e9bb42864b806990884b9f2c19110238ad5d5fd18bc896e9fa7cde130b4ccf3f7003db43f6b485caf5b021f5d5e36f279f9d36
diff --git a/x11-terms/xterm/xterm-378.ebuild b/x11-terms/xterm/xterm-378.ebuild
deleted file mode 100644
index 74aa97997f57..000000000000
--- a/x11-terms/xterm/xterm-378.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
-inherit desktop flag-o-matic toolchain-funcs verify-sig xdg
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
-SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
-
-DEPEND="
-	kernel_linux? ( sys-libs/libutempter )
-	media-libs/fontconfig:1.0
-	>=sys-libs/ncurses-5.7-r7:=
-	x11-apps/xmessage
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-DEPEND+=" x11-base/xorg-proto"
-BDEPEND="
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
-"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-src_configure() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-
-	# bug #454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
-
-	local myeconfargs=(
-		--disable-full-tgetent
-		--disable-imake
-		--disable-setgid
-		--disable-setuid
-		--enable-256-color
-		--enable-broken-osc
-		--enable-broken-st
-		--enable-dabbrev
-		--enable-exec-xterm
-		--enable-i18n
-		--enable-load-vt-fonts
-		--enable-logging
-		--enable-screen-dumps
-		--enable-warnings
-		--enable-wide-chars
-		--libdir="${EPREFIX}"/etc
-		--with-app-defaults="${DEFAULTS_DIR}"
-		--with-icon-theme=hicolor
-		--with-icondir="${EPREFIX}"/usr/share/icons
-		--with-utempter
-		--with-x
-		$(use_enable openpty)
-		$(use_enable sixel sixel-graphics)
-		$(use_enable toolbar)
-		$(use_enable truetype freetype)
-		$(use_enable unicode luit)
-		$(use_enable unicode mini-luit)
-		$(use_with Xaw3d)
-		$(use_with xinerama)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc xterm.log.html
-	sed -i -e 's/_48x48//g' *.desktop || die
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-377-r1.ebuild b/x11-terms/xterm/xterm-381.ebuild
index 74aa97997f57..175692654251 100644
--- a/x11-terms/xterm/xterm-377-r1.ebuild
+++ b/x11-terms/xterm/xterm-381.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 DEPEND="
author	V3n3RiX <venerix@koprulu.sector>	2023-05-31 03:22:19 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-05-31 03:22:19 +0100
commit	3810dd6a469ba3e0014a390d92f1fc220dd20c3b (patch)
tree	b7dd01f1153f84e36981e0ae398c7e047d878cc4
parent	2f210c93c08515a806199783aabe37d12a0197cb (diff)