gentoo auto-resync : 12:08:2022 - 02:20:53

author: V3n3RiX <venerix@koprulu.sector> 2022-08-12 02:20:53 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-12 02:20:53 +0100
commit: 671bddebe185c0542619bff3199935bfc8833727 (patch)
tree: a45296237166c760a0cda0a72836dd451c57a8fb
parent: f4ab034d81402342178d7cca4689e01193cd38ca (diff)
113 files changed, 1610 insertions, 594 deletions
diff --git a/Manifest b/Manifest
index 23b031ab6d3f..c1b8935099bc 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29677 BLAKE2B 7107c7b1c36273c227b378eaf6040390895e4a38514f93603a2270492dfdf97899b9ebb7c4b028918d82434bbb7a1ac8a2e07d242c5141c7bf379732a646c3c0 SHA512 6596f8aa2efd3b78e908a25cdb4832e4d40445e56ba5e0dd19c83727ed996db5a3f28cccc1201dce3a28a12238392dfecd97f88d11bbcf4a18576d4be767fd45
-TIMESTAMP 2022-08-11T18:40:05Z
+MANIFEST Manifest.files.gz 29655 BLAKE2B bfec2e84667541acf91669da9b2c85f698041a2e1e0212ad79d293508e6f92777aa546641b3a35ba3381490f8b1d0e4f1533abf3999313aaf00ee3fd373d036e SHA512 1cff9b7ecb4c71fb2d1de4cf7492daacb5627fc068d6bac783b80cbac382f2f1f5ca3023f3f33bb802db3d093817b0c80e63a16a37398781e9a924d0d109a16f
+TIMESTAMP 2022-08-12T00:40:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL1TQVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL1oWJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCEqhAAh8eAwLuRzKidR4gM2YkG3oD0hTB6kjXlgV7QhnZmHw1o7skpH1z4tn3e
-R/UoSp7OzwCfvzen/USBWwDZhcMzeFkLlml2Qzm/NcOd1tc7tiOmiKPDngb9TxMS
-Lx9zGLA1KiNQxyrT5k4hqMMFMKF/0FR3sl9LpQSwr4Vd+R/jmvR870OC/DK5X5qf
-cAcwlF//qVHX1CzbWIqyNzdsR9SVI4PxCxahQIAxGkqmZwbt6DMJYuKz14/ZEaXW
-GwHfzHWmcSW39KH0+qJ+rauofgZW7e6PUqxKZce+MqASWjVogNkNBaruRwx4NCfQ
-uJQ5BatwDxorSkfYaDkZn4a+xTK1N5KLhPZnMW4yiyqsH5Vmi1qtBhJ5bUH5PTer
-gPpJhMITAYpM7p/Mx59qzsqFWletcX1anOjJ28CnoUhrBKNAxpSKS6HdfC7p0f4f
-MQKh/XddKCE2ktgFiMMzN6WCU66zCyP9DdScsTL71/N6V8PHouXsyRrxcradEfQQ
-F2uBkUtBZ874cEmIMqjsott7rlXfZPdecW6E7DrpKXnoV3psmhU7YJGYFRIYhmR+
-KjhG6Zzn2KMo45uLsE/qyWyUQRtHnNsA/mOGpCXmE1U8DVsPAXrlT+8/KxUx++JU
-VB/kx9+iV8//lKAINA6XOWbSBU6s7XbvYfH+w7QKXvriDvjQ0P4=
-=QESu
+klCOTg//drzF5hC8jGhBblvO6W57htQ9SO6pk/e9ltSgZVhgm5SxCFvF4w2EoCQA
+9TKqtneRFD4kLdG3zuirf35EDaeHwQaAsY/csd/Zd2PxSwQg9jN8a14QSUkaBmCY
+zwS4srwF/Lm6UIc3kVyk9Hht5mwBkx+jYbFl5QdKEcyuUKzv37Yp0zaLylDcG3er
+AoRAsB4T0ao06IN1MUXbimeZXxMqlUYLHesndaMm5IndeSCVSRPOhuasGr/I2CWB
+6wSZoxYwTTzrmp8gjAG6A8vWtJx/LBTMYGDWw5tUmNhf3nCyyf+BT0/vqzyMA8UH
+bpncPq0feI5s0ju9eAucfr1ApgsIjFbxGW18m8kgSFk+9LIq/9Kp5aM66Dfp2VOd
+HAfT7eN3inchcgKOn9Cz2f5jbYNteevcXNiqMANrjz9cBoo7nY4RG35YYPfubkwL
+oBGgPs5W6ET104GJVXORRpFumHEx3RabDLTqqhlguEms6+uES6XZup6a5vje0LtX
+wPyU6zE9xxFZU+t4EgB2wDPKQqnskGjV3n6vJw56sAD+xZzNsDSOmOajxVOCCFlH
+iRnDwfA9hlLUu1RH/eWvKKuMAcCjoSF7h3BWTrMkMGWnR26zDxSiLZu2bcN2EPf/
+twi+ri84kCw8VGimcF16p3JLXeWeQV9LvIFnUrh+OZIiD8/C4Jg=
+=qgwM
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 912611f21f53..1d51d786e0ae 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f157f5448ccd..148e2fb9a319 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
index 509aed599aab..74a044290bd8 100644
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@@ -2,9 +2,11 @@ AUX vkd3d-1.1-Fix-build.patch 707 BLAKE2B 6d9ae111c19c61bbb63115bbd960d32a1c28c3
 DIST vkd3d-1.0.tar.xz 461884 BLAKE2B 4dbd729f9e795d3d81178abc1a8774c0bbe6a5257c96c97acf1e4b4cdb5b7e30c77235e8b8fa57f7db3196caf30c55c3b0c07e2981629dd6177436a3cd117d33 SHA512 55712528688cdedc63049e168b371b470dbb8e31ddc36d8b23b0655f4a061726eb8556b9abf3cb887f6bd21379959aed9fab93ba0fd53813aec413ebec71d615
 DIST vkd3d-1.1.tar.xz 487452 BLAKE2B 834ca06d2159a5857dde457f27e541f06624e87633af6aca7445867abc38c56a1da1fe34b6795ffbd6aa73e983ac0e4301402ae35ef8358fa8cc79c12972b11d SHA512 e107612bdca95e998f9d819bdf74e4ffe1b4d400d250ab855c4ebf94b7d3f088b3221591fef03b1c6b8ecb030feb1673f74831bd8bd8edda2989d09a8846b0f7
 DIST vkd3d-1.2.tar.xz 611240 BLAKE2B e7ea3f7120ad1092be0239bdc2e6d0dfdfecc3b1c2e7c359c4bfbd8c259f092e041a75a0e896da9a1c6370d5716590711128d31c9e552897b177b300b9a15107 SHA512 ca9d5b11e7770747b78b61f43196b45b7bda8d2dd4f1d76da915f895a04dc28c20499e1e433f5ce17416964fe0f37cdc907e7aa540ec9105afbc8a100094f3e7
+DIST vkd3d-1.4.tar.xz 774920 BLAKE2B c46a71b495fc41658ea493f65ad15aec18202889a9c7925962301cce91f32e197c5850f374331595e4bd267fcbf9836531e733fb5880ddb4936476ddedd19bbc SHA512 58535b57b0b506542f2867e9b1229682f012216b9f8913d2692d4ed64a8113248d66ea710127ec2064baf9511b7f2be7b757dffcaf95a43168d781010d007ddb
 EBUILD vkd3d-1.0.ebuild 926 BLAKE2B 414506ab4d6f240d57ca56e6e3ac080722d2bd375db9c790089ca310ff6340af1d5cd33185af795cdd581405d93f19610b1026087eedd358a3769159b29d4eb1 SHA512 29625db76407d29252f534b11296f0d3df7dcdbc567c9a0e0201765ee75370b28bf9098e96752e128ec4533209eef8dd0bf1f3000f818b5c97bdf12a32404466
 EBUILD vkd3d-1.1-r1.ebuild 980 BLAKE2B daaff20825a376043e4fceb986c67f317967a6b59c1d005060e4e5ced5f1b8ffc9e6f8d0d6ed3c03088c7345be584c5815d978668ef9be936e94aff7db396c7a SHA512 485bc1411a2f71639a107b3f75081a315e4fd8a948116b77f99400ce9b67a21c2e8d0c6de5e26c80cd7d9507306c85ff36f792070691fd65f081cc31a7b27cc2
 EBUILD vkd3d-1.1.ebuild 929 BLAKE2B 3b1a8b289d47ab301fec2a45d5bde71759a0c23a36c6f9009ea7626860436a77f3bb3ff45184ed94f1b26cb859b5a6ae874cb66258edb0a52b8bf78b0ae9dfaf SHA512 db1e44ca23bcc636a61f9019a02558efc948bf7347e6ba11034ac0bae7cd0562555788b69dc98f0ccf67f4760b4c02338e81c54d5ccd8ee8d3ccd004bbbf66a4
 EBUILD vkd3d-1.2.ebuild 1014 BLAKE2B f4305c940dde99c678485c66800e9a5713ea293c8e4b7d523e8004a3e69a45e297a4fb15ebaf04be435fbb5990e9c293fc54b42653e05cc3bf797e9222dd2358 SHA512 237c2b4c0964be401ad514529e2753e88489f02557eef60816d18c494a6fd20b18f11b5dd2cbbdc234897333cc3dcf6690ec1bcac8826a7bcd8fc8b0c68206e9
+EBUILD vkd3d-1.4.ebuild 1016 BLAKE2B 6c1a5f13d7a3f4eeab2548ed0860034b1d397bca2669ea56db9a4619431aa2ca8ecabea788f1b7ec3e340f0a18c013dfc4a06f70178cea0d582a53a79b9555fd SHA512 e56dc910a014e4c93621073aed8a6f9f20af0f719dcfcdc278502f1134a257e787629007abf84c1872ece3b6a9a5b9fe272e70619b4d16dd75810cfe68bb70d7
 EBUILD vkd3d-9999.ebuild 1016 BLAKE2B 6c1a5f13d7a3f4eeab2548ed0860034b1d397bca2669ea56db9a4619431aa2ca8ecabea788f1b7ec3e340f0a18c013dfc4a06f70178cea0d582a53a79b9555fd SHA512 e56dc910a014e4c93621073aed8a6f9f20af0f719dcfcdc278502f1134a257e787629007abf84c1872ece3b6a9a5b9fe272e70619b4d16dd75810cfe68bb70d7
 MISC metadata.xml 563 BLAKE2B c976a16a495bdb5863811acda56b2cc628683a63fc2a22c18d2a09775d3a38c845e00f83b97b318d9a0e5267bb470dd56d334dc9f43e3716784254802b8db60b SHA512 3d5afb7890b3b10ad424fcfe3fa2b42a9227ba0b82be8ab85308126966f476798818ee0ecc88c53105b218f465a72b213efe00968112431169884a4a6f48c6a8
diff --git a/app-emulation/vkd3d/vkd3d-1.4.ebuild b/app-emulation/vkd3d/vkd3d-1.4.ebuild
new file mode 100644
index 000000000000..e64cc1a24558
--- /dev/null
+++ b/app-emulation/vkd3d/vkd3d-1.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
+fi
+
+#Tests fail: https://bugs.gentoo.org/838655
+RESTRICT="test"
+
+IUSE="spirv-tools"
+RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
+		media-libs/vulkan-loader[${MULTILIB_USEDEP},X]
+		x11-libs/xcb-util:=[${MULTILIB_USEDEP}]
+		x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]
+		x11-libs/xcb-util-wm:=[${MULTILIB_USEDEP}]"
+
+DEPEND="${RDEPEND}
+		dev-util/spirv-headers
+		dev-util/vulkan-headers"
+
+DESCRIPTION="D3D12 to Vulkan translation library"
+HOMEPAGE="https://source.winehq.org/git/vkd3d.git/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_with spirv-tools)
+		--disable-doxygen-pdf
+	)
+
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index c311eb359fd8..8de3841b4410 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index 3e1af54437b4..02956e348367 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1,3 +1,3 @@
 DIST wine.eselect-1.2.2 19370 BLAKE2B 957eb84b7ccb24d12eba876a538f0420ab05506c87086b65c27326c80da9adcfbff032c7ecc7b5763012c6d72cc53f643f0d3ffe02687adb103517dedfad2f0e SHA512 6380e904ca824b1fe45cf651637f1cfe931f0c7519db49cb0794826ebbc8bdebc480fe7eb16601dc37123b44ea2d10aec49aa9fe622cad3e67ffb0f730292614
 EBUILD eselect-wine-1.2.2.ebuild 1271 BLAKE2B 18abe8ac6ec8844aaa55960702833da507fe8f7a5ec74c197520aed6d14eb5e9be5dcfcc4417cc372dd13dd79483ecfd026f4935c1608a76bc8307e3856af81e SHA512 2846fa7e5641ed5585f591335e526f9eb698f97349631afae18dcfc783641ed0f9708346241c0aff5419898de672133454183b05a4154e29ccc0e50b08fa93c5
-MISC metadata.xml 283 BLAKE2B 3d4b2057ab977b7d4197d8ecd9466d37941ed34de40ce2c01941705969e123f74589f762f6f1b36fbd703d6139a71b56942b59f589c39aa74757ba378362fc25 SHA512 4a03187e6a9a477bddcbc541e05b8c1a9cf109d814fd8eb4b70ad5c41d66a925ff3bb17643a5323b3dab55393dcad26ddd040c208471376a6b3206c569f53926
+MISC metadata.xml 352 BLAKE2B f1327231dff33666a1fe443dd26542d9d25a67d47327a0255bf9b34377603583513dbe78e0c270576998b91279fb5f6cfca119cb8c632eaa9fe5f37ca35751b7 SHA512 8f4998376d93ea9705d5c4d36b360d1bf54332a1566fe61c07391f707cc0efc350a33ac91d42a8f8a6534327233c33fc8b8f1ea7142b28eb56b94e5621dc016c
diff --git a/app-eselect/eselect-wine/metadata.xml b/app-eselect/eselect-wine/metadata.xml
index e8ff4f1c8f62..280cd5c41bf0 100644
--- a/app-eselect/eselect-wine/metadata.xml
+++ b/app-eselect/eselect-wine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>wine@gentoo.org</email>
+		<name>Wine</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">np-hardass/eselect-wine</remote-id>
 	</upstream>
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 8c521abd94c5..ddf9e7c8125a 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index d025cfbc4c2f..b484ebe98e84 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,6 +1,4 @@
-AUX minetest-5.4.1-gcc11.patch 605 BLAKE2B d067b6bf6250fa9928c01220fb0da2c8ffc093c949840767db6cf2b84fbe889fd9ed2546c953048d02116f015a279622c1ada29ce1df6e3b254b0d0e9e56083d SHA512 f42b8c3c38b40a9f22eca7947360ae4d786ff0775f46b4184c3fe014b64958c89828bae314acd8bfe99246a452c818527b5d3c5c1c0b813ed0a82c43b915125b
 AUX minetest-5.4.1-system_puc_lua.patch 1285 BLAKE2B 773466b132d1e7fdcd2108c7cae9d7538d02319140c91c87b5533c4225fe64077a4400cdddbfa0d96b256fad54ef7b92a5239036789b2af3a57365ac0a305808 SHA512 acb1ddb7e156324b3e4aea2807ba7b708b563bcf70208bad672a1777eb116dd7c812fcd420cdfb3a08b9b3fe4adf8a56b51ee2827439a058a78e8ffc4cb07ea4
-AUX minetest-5.5.0-bundled_luabitop.patch 740 BLAKE2B 91f86c47f17572d1bf27be5012cff147eea6625683d4cb5f285f2da72a541a0f5cf3128f0cf4b9514bf0b4f9a27673f5c989dfb4757d4142b8f24ccb29df6918 SHA512 6bdfdb6a1e022a66c67aa1e2314ed1f4e6791f4901a811e63606116c7e4058e801d1fb772a1f75378c8404e8085cc072b6987b867b45bb0c10b5bed01e6779ff
 AUX minetestserver.confd 310 BLAKE2B b5af3f5e87622fc3e1739f3972b32a3f83fa720476d7398ce55657b2e4d2dc8693748720aa422724b40a1309f79158b37ba9628061db31db3e5757a73c122205 SHA512 4905fb8446d82bdd7ccffcd6f0c2f85de9843107f10d21d73814f54587aab5f6c7716a78bc32cd82c8b7d8443f0492a3a7b5e47d10f2900349047b6ba7ceb2f3
 AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1
 AUX minetestserver.logrotate 71 BLAKE2B 9189610adc6e78be5249163e3daa02ebcb73822bed9939df3a807ec47e753e9952b3ac7932327164ae5dcf1ef149f55fdb898b1818412b994572f8ef6b4615e4 SHA512 82de44aa5670113d6a244c7cc662e6f4001510c6766490375f226d2abd4d7749310e8a21d282408a711478bf8449ab15036d9a914657e2ca4699395d32d8b21b
diff --git a/games-action/minetest/files/minetest-5.4.1-gcc11.patch b/games-action/minetest/files/minetest-5.4.1-gcc11.patch
deleted file mode 100644
index bb37cdf31e07..000000000000
--- a/games-action/minetest/files/minetest-5.4.1-gcc11.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 7c2826cbc0f36027d4a9781f433150d1c5d0d03f Mon Sep 17 00:00:00 2001
-From: lhofhansl <larsh@apache.org>
-Date: Thu, 6 May 2021 10:24:30 -0700
-Subject: [PATCH] Fix build for newer versions of GCC (#11246)
-
----
- src/clientiface.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/clientiface.h b/src/clientiface.h
-index cc5292b71bf9..dfd97674137c 100644
---- a/src/clientiface.h
-+++ b/src/clientiface.h
-@@ -31,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
- #include <list>
- #include <vector>
- #include <set>
-+#include <memory>
- #include <mutex>
- 
- class MapBlock;
diff --git a/games-action/minetest/files/minetest-5.5.0-bundled_luabitop.patch b/games-action/minetest/files/minetest-5.5.0-bundled_luabitop.patch
deleted file mode 100644
index 5006ddd499b6..000000000000
--- a/games-action/minetest/files/minetest-5.5.0-bundled_luabitop.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-When built against PUC Lua, minetest binaries get linked against
-a customised version of LuaBitOp which then gets installed
-as /usr/$(get_libdir)/libbitop.so. This violates the policies of both
-Gentoo (unversioned shared library) and Lua itself (compiled extensions
-should be installed into implementation-specific directories rather than
-top-level libdir, and I'm pretty sure linking against such extensions
-is a no-no). Switching to system dev-lua/LuaBitOp will require work
-so just make the customised version static for now.
-
---- a/lib/bitop/CMakeLists.txt
-+++ b/lib/bitop/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_library(bitop bit.c)
-+add_library(bitop STATIC bit.c)
- target_link_libraries(bitop)
- 
- include_directories(${LUA_INCLUDE_DIR})
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index c9db43a1f3c5..84e3ef75ac47 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/balloonchase/Manifest b/games-arcade/balloonchase/Manifest
index 826163366a82..b5e1b7b693d0 100644
--- a/games-arcade/balloonchase/Manifest
+++ b/games-arcade/balloonchase/Manifest
@@ -1,4 +1,5 @@
-AUX 0.9.6-gentoo.patch 6154 BLAKE2B a8729b678e4d8ece1ad327e0d35b63fddef5b28f9878efc89802ee8c4263dd9a758f1d13f66ce7125d069dc1874de680ff96888461516f142716b668a46ec687 SHA512 a16b70a3c1ba071b8e058e252843827e8a5b63d5b87e2332a93cb8d43e00ccbfd6b7aa13406275980c7a7cffd32b1b1453bf5d1f9c9c0b585cc969f5b9c6ae81
+AUX balloonchase-0.9.6-gentoo.patch 5319 BLAKE2B 165951c23ecf7f49f92600a5e90e7707e9d5e2bbcd91d2a32eca01c7dec1ced472e55c3b2ffba6be95a393d70d13818c9c029dfce982f4a6be7e9636859a86e6 SHA512 c76167877a6f5ac413f610fbb17ed5a164c0806af6823652f4e7d53c3b1db2df6cd2a3acef5d397eec7c5fdeb7e16eb224c96c27eebcc51857bca005f974d865
 DIST balloonchase-0.9.6.tar.bz2 523085 BLAKE2B 50e453327d51da3fe40f52850cb2fbb7a10e897f59bac5d6f4a676d3211d3dcdae00359304ad119252ebf98e9f46482ad801078762f16ddc609bc94b68c3fc18 SHA512 ab5617713c96187564926fd5ecbdbf5186f78c23cfb43b26b28b9d18e71330efd77700cf7cd02e04be7fd8e33f2d30bf59f64954135ac82802d1d839dc2e7767
-EBUILD balloonchase-0.9.6-r1.ebuild 823 BLAKE2B 8fe0e1701765087731667d8a6fbbf97c4151fcbbca003f21c6ffbdf4306b35dd26f52b4313ebc862609d981793113957094fad8e2017208b4bf013c6a8f98178 SHA512 86eea2e2b37420a01a4bc9993c0b7e81590a2331fb702dbf57a8bbdad0d14cf5c8aaaa43267301987862552f5d8b584c18697f6f040ba5427532e8097f7efd90
+DIST balloonchase.png 1744 BLAKE2B d78e636c0cb2ef521967035ce96fbee0e7b2659cb5127ba32cd3437394a709941fd915dfc0f376d47c2ad5ca81f6392f5942c2737cb2524ec3a041dc5b8c6c26 SHA512 bfd32d65b5cb290df90881cb7a953f1cac38f4e91151c672e4320b9b41f7bff46ef97d6c123aa7267b241710dccf4ade409ff129c945af1ee06d33fdf490f169
+EBUILD balloonchase-0.9.6-r2.ebuild 846 BLAKE2B 6972cefef5fdc8fea1501b68b0f3118ea56a97a1cd59810253a77b7c58930e08c6e1648af4ef75918b02a155f3e6f550c0b42ce96536531fe45e27f651886b05 SHA512 be9e3eb831205a0e866f3ea344e9879afe006a18ca8c6e5db57fd259a39249710d745a07b2b6d32ae94f54432ce9c3f3e6d200d3c77c72c72e68b38eda16de22
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/balloonchase/balloonchase-0.9.6-r1.ebuild b/games-arcade/balloonchase/balloonchase-0.9.6-r1.ebuild
deleted file mode 100644
index 36976cc63a40..000000000000
--- a/games-arcade/balloonchase/balloonchase-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Fly a hot air balloon and try to blow the other player out of the screen"
-HOMEPAGE="http://makegho.mbnet.fi/c/bchase/"
-SRC_URI="http://makegho.mbnet.fi/c/bchase/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PV}-gentoo.patch
-	sed -i "s:g++:$(tc-getCXX):" Makefile || die
-	sed -i \
-		-e "s:GENTOODIR:/usr/share/${PN}:" src/main.c || die
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r images
-	newicon images/kp2b.bmp ${PN}.bmp
-	make_desktop_entry ${PN} "Balloon Chase" /usr/share/pixmaps/${PN}.bmp
-	einstalldocs
-}
diff --git a/games-arcade/balloonchase/balloonchase-0.9.6-r2.ebuild b/games-arcade/balloonchase/balloonchase-0.9.6-r2.ebuild
new file mode 100644
index 000000000000..aa65b89196ec
--- /dev/null
+++ b/games-arcade/balloonchase/balloonchase-0.9.6-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Fly a hot air balloon and try to blow the other player out of the screen"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="
+	mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/libsdl[video]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "s|GENTOODIR|${EPREFIX}/usr/share/${PN}|" src/main.c || die
+
+	tc-export CXX PKG_CONFIG
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r images
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} "Balloon Chase"
+
+	einstalldocs
+}
diff --git a/games-arcade/balloonchase/files/0.9.6-gentoo.patch b/games-arcade/balloonchase/files/balloonchase-0.9.6-gentoo.patch
index ff232693422b..c847f0677660 100644
--- a/games-arcade/balloonchase/files/0.9.6-gentoo.patch
+++ b/games-arcade/balloonchase/files/balloonchase-0.9.6-gentoo.patch
@@ -1,26 +1,18 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -1,4 +1,3 @@
+@@ -1,2 +1 @@
 -LDFLAGS= -lSDL -lpthread -s
  CFLAGS= -Wall # -DDEBUG
- PKG_BCDIR=balloonchase-`cat src/ver`
- PKG_BCVER=`cat src/ver`
-@@ -9,8 +8,8 @@
- clean:
- 	rm balloonchase src/*.o
+@@ -11,4 +10,4 @@
  main: 	src/main.c
 -	g++ -c -o src/main.o `sdl-config --cflags` src/main.c
 -	g++ -o balloonchase src/main.o `sdl-config --libs`
-+	g++ $(CXXFLAGS) -c -o src/main.o `sdl-config --cflags` src/main.c
-+	g++ $(LDFLAGS) -o balloonchase src/main.o `sdl-config --libs`
++	$(CXX) $(CXXFLAGS) -c -o src/main.o `$(PKG_CONFIG) --cflags sdl` src/main.c
++	$(CXX) $(LDFLAGS) -o balloonchase src/main.o `$(PKG_CONFIG) --libs sdl`
  pkg:
- 	@echo $(PKG_BCVERSION) >VERSION
- 	rm balloonchase src/*.o
 --- a/src/main.c
 +++ b/src/main.c
-@@ -333,47 +333,47 @@
- 
- int InitImages()
+@@ -335,35 +335,35 @@
  {
 -	back = SDL_LoadBMP("images/back.bmp");
 +	back = SDL_LoadBMP("GENTOODIR/images/back.bmp");
@@ -71,8 +63,7 @@
 -	font2 = SDL_LoadBMP("images/font.bmp");
 +	font2 = SDL_LoadBMP("GENTOODIR/images/font.bmp");
  	font = SDL_CreateRGBSurface(SDL_SWSURFACE, 1288, 100, 32, 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF);
- 	SDL_SetColorKey(font, SDL_SRCCOLORKEY, SDL_MapRGB(font->format, 0x00, 0x00, 0x00));
- 	DrawIMG (font, font2, 0, 0);
+@@ -372,6 +372,6 @@
  
 -	blobtrox = SDL_LoadBMP("images/blobtrox.bmp");
 +	blobtrox = SDL_LoadBMP("GENTOODIR/images/blobtrox.bmp");
@@ -81,27 +72,17 @@
 -	balloonchase = SDL_LoadBMP("images/balloonchase.bmp");
 +	balloonchase = SDL_LoadBMP("GENTOODIR/images/balloonchase.bmp");
  
- 	TMP = SDL_CreateRGBSurface(SDL_SWSURFACE, 259, 200, 32, 		0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF);
- 	blursurface = SDL_CreateRGBSurface(SDL_SWSURFACE, 640, 480, 32, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
-@@ -578,7 +578,7 @@
- 
- void createdat(int winsneed, int option_wave_effect)
+@@ -580,3 +580,3 @@
  {
 -  FILE *OPTFILE=fopen ("balloonchase.dat", "w+");
 +  FILE *OPTFILE=fopen (".balloonchaserc", "w+");
    char datmsg[60];
-   sprintf (datmsg, "Balloon Chase settings file -- Do not edit manually!");
-   char tmp2;
-@@ -588,52 +588,32 @@
- 	}
-   fputc (winsneed, OPTFILE);
+@@ -590,3 +590,3 @@
    fputc (option_wave_effect+2, OPTFILE);
 -  fprintf (stderr, "Saved configuration to balloonchase.dat\n");
 +  fprintf (stderr, "Saved configuration to .balloonchaserc\n");
    fclose (OPTFILE);
- }
- 
- void checkfiles()
+@@ -596,42 +596,22 @@
  {
 -  char found=0;
 -  #ifdef WIN32
@@ -161,23 +142,13 @@
 +		createdat(2, 1);
 +	}
  }
- 
- Uint32 rgb(Uint8 r, Uint8 g, Uint8 b)
-@@ -1257,7 +1237,7 @@
-   SDL_WM_SetCaption ("Balloon Chase", 0);
-   checkfiles();
+@@ -1259,3 +1239,3 @@
  
 -  FILE *OPTFILE=fopen ("balloonchase.dat", "r");
 +  FILE *OPTFILE=fopen (".balloonchaserc", "r");
    char datmsg[60];
-   char varmistus[60];
- 
-@@ -1275,7 +1255,7 @@
- 	{
- 		winsneeded=fgetc(OPTFILE);
+@@ -1277,3 +1257,3 @@
  		option_wave_effect=fgetc(OPTFILE)-2;
 -		fprintf (stderr, "Successfully loaded balloonchase.dat\n");
 +		fprintf (stderr, "Successfully loaded .balloonchaserc\n");
  	}
- 		else
- 	{
diff --git a/games-arcade/cob/Manifest b/games-arcade/cob/Manifest
index 8c5a0c31da56..f47fa1447e8d 100644
--- a/games-arcade/cob/Manifest
+++ b/games-arcade/cob/Manifest
@@ -1,5 +1,6 @@
 AUX cob-0.9-gcc43.patch 618 BLAKE2B 211bc0f4221b05ed761b8d214ebb11e6cf4262d89ba01beba75a10297d70547ea0d66c6c85d313fdc0826706bd8270e5741ae5e44ad5e97b4a078e25163eac32 SHA512 15cdb6cfacdd49e37fd41e337f425e9f3f020f9d019ea8d1fb860d14b0cebb04dab558c0bb1aa923d0d58fac56c6d579398b0ca7c18e70989c3efd924452d7e5
 AUX cob-0.9-gcc44.patch 1147 BLAKE2B 01a069e45b39b2d4bdd3d066ff295a2e99d2d782c5e924ab2aa5a4614e9b9482acf52735a0f48e6d7d312d101ba3652987fad9fa675897d1b49054fec85d0ffa SHA512 169559f882eba5f34558f845c44c09ba6821db689ae5a73dc6e8cd14ae12d4299fbad3e67b4c828fa3de435c20e948fb8c0266e3267b52b5bb87302047d4034d
 DIST cob-0.9.tar.gz 712618 BLAKE2B f73bec711f4e2c7907cf987fdd12207556752e05f5cf98f9818ef470c2bc2fa95f03c8c4a2f6c114b87d5c00cf3b17da3a1d127869b7ee548d5bd0d05d4c4114 SHA512 1a329bb06a25137c1dc9d65cff949ed1b0ca7445ecf897375be71581c35f0bc563008fc7607d650a660a405f2282b0329148487bd29b6a053478b61d932bdf4d
-EBUILD cob-0.9-r1.ebuild 583 BLAKE2B 8030b1b863e19a856d1f2e22c1c5a0fa162c8bc8e6a01eda0e154d941dcdc52f6954493a136280e579b4e00c6900f72d3c2c51be87b70069c8adc07ff0345421 SHA512 c90b912a22b8beab6f639f766fb0f8066d1042421562405dbd4c55259bae7287a2675176fa9bbafff6b04c1762e485c6f306a5b6a5eef2224f1b4f4e2a23faa4
+DIST cob.png 755 BLAKE2B d560e5b72275c174d4285f54e900f8fb82e54fd358df7aa07c37e9e75974fc776293faa9cb9c26c4aacbe28961462432b3d97193365533851b7c5179e291a6c2 SHA512 201e8c4d534532d22417e6a96832061e0286ade7e2fc768b9391114e86565cb38365674dbee19f13029e43b55dba7332ccd9536ff26629e3f7382090b8224882
+EBUILD cob-0.9-r2.ebuild 644 BLAKE2B 18b90f0ce826ba8d80b71c9eda8e39130305abb4f70d1f47e2638a1adffb20b77d3f47c7111dfa41a05ebbc864de04f989fb0d111f010ccf5ec39cc90736e783 SHA512 1aeba0deff1b71acda28b000c9211eb5af182846413b3f5408ade987bead7927c99db081997ad3a2b4bbf10334039167b88ced43ee11dddddd51c4562c32d46d
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/cob/cob-0.9-r1.ebuild b/games-arcade/cob/cob-0.9-r2.ebuild
index 8851838f489d..b45c2ee9e74b 100644
--- a/games-arcade/cob/cob-0.9-r1.ebuild
+++ b/games-arcade/cob/cob-0.9-r2.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit desktop
 
 DESCRIPTION="Cruising on Broadway: a painting-type game"
-HOMEPAGE="http://www.autismuk.freeserve.co.uk/"
-SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="
+	mirror://gentoo/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl[joystick,sound,video]"
-RDEPEND="${DEPEND}"
+RDEPEND="media-libs/libsdl[joystick,sound,video]"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc43.patch
@@ -23,5 +25,7 @@ PATCHES=(
 
 src_install() {
 	default
+
+	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} "Cruising on Broadway"
 }
diff --git a/games-arcade/conveysdl/Manifest b/games-arcade/conveysdl/Manifest
index 8f3211d719ed..e419d281aace 100644
--- a/games-arcade/conveysdl/Manifest
+++ b/games-arcade/conveysdl/Manifest
@@ -1,5 +1,7 @@
-AUX conveysdl-1.3-arrays.patch 997 BLAKE2B 6a243b48ee809c86a02a6c49117a0e86a1b0dbce80cb9c761e693b66a576536b92ffb1c61e0bb3676d2b6850f1b8985d52d0c0d67de4bf9e6aaf186fed2e1bac SHA512 c4d52d0da7bedb4941d7438203e7c1d25d72960ab739e1a4c359628424a95f95001340b74b7926ae22c7c837f2f7a241891381f16c3a15f75e51ad908cc6b56e
-AUX conveysdl-1.3-speed.patch 1410 BLAKE2B 2e0716f1a40e2a42cd9e30e3154f3b79dd4691e97a530761d8f4b6d3f1069382c5e430b56df5f60928f1c249257652c8c4b5800ba08a5d6881bd9d8267dfd378 SHA512 8766d4c522b58f9def8d7f1a9b928287643068daf6594fde91ba1fe9aa6363eea36958d98ca3aa40eead761eda7a253209cf74143b4a6333f2e0ed9bdc116fbf
+AUX conveysdl-1.3-arrays.patch 757 BLAKE2B d5a54bf0bbc751c631f3aefb62a316f45710b9b3e1e4a114f932217b4f6eacc02bcec0a4cded626e08e738e9fb30df9dfc46a944d6bef83b06079d1ec2deeb00 SHA512 1e78cc3053085b8a352d57c964d2509b98f54efdf00bb63ee1988c85b392c6364835757eef687caeec517de856d0b55b55b6efe610731d38f1d71bd4f52d03ce
+AUX conveysdl-1.3-audio.patch 323 BLAKE2B abc409c5c369aed932c020f58271918f76f00088b44d3f25d8cba6f72333b9d47c43c4d9eccdab543de67b3c5d6ec667615102ee7c85e04a953687de6ea29468 SHA512 7974f0fd495767e4211866898ffff2f7517aa6e2e52fb489c812f52c4a458bcf9ccd8e4b57d1a752a46ce8044bbe25788d07bdf077473f94fe974449b0c98176
+AUX conveysdl-1.3-speed.patch 980 BLAKE2B c8909d766aaea88f80f0d2ff778f8b9eb2e3e7e1db9773836fa53beff91d68ba3479cbf15ce0a76c6b27f2eee53726ba789510846f6f48cd3fbe21fb806ca7af SHA512 0526e9260b7b72b16e463f02de379e47f05f725dd0a41dbab073b8f99a171e36274e87d96625f9d8bc504bcfcbc58c526291d81a14c142f744d9d21b280f870e
 DIST conveysdl.1.3.tar 429568 BLAKE2B 950952ad311bb51855bbd1cf3bf25b750d067db1cef8333f44ac3a96f30033f700efb9771d3050be6a3acc63c79b49fa8d64a1a11a088a777a13f21fb82a4c81 SHA512 fe6f91cdd63ae1019cb99613618e44ceeddb4080ad5e50bd8ce0abf27e057617d3658a29b2faf668cbc3b0887f1a4a05cadadb060f69d850c3d85c9e7190dd8a
-EBUILD conveysdl-1.3-r1.ebuild 1182 BLAKE2B c1cb698ccf522954912d7c83c68c3504cbf214e617d5297c656ce6c4b7da0a263ee564583957cf9327bf629a4a46dcb3a936c69cbb3de1c6c865915fa3f626ac SHA512 d3208c340112cdced7d2309548266842ea8ee936f1e26358e479a67684365722fbe893d858f8935f91501f2990c02b1f3c4f5411ee5f5aefd8b1bb051a72a5f9
+DIST conveysdl.png 328 BLAKE2B a62da06757da9e103e7156a5fbda7b9a7e0381aa6d203fe4ed7e46568073eef6287a955303a227975f9e073dbab3bad990a8033200da204059887bb8078203c8 SHA512 dcf99bc5112189a5d33a183a8a6ecad3b70456a75112a3caece1d87f967fcb14279f6a2f9a47dc67967806c09b5725cb2f239c29be9370336c0f76bed4db1867
+EBUILD conveysdl-1.3-r2.ebuild 1113 BLAKE2B a1ba37672517d336b58d5b2ede87aa49b77e6ad4749cf2622406cfe288afe3409fd0a884763e6b9ddc6d06739837319381615eba98625d852a7f65a893b32dc7 SHA512 067bcb64c8b7c011f2c91491729d09b05c9a4a2a243ac160bafae3c4a0ea5e3dd97da12c18b6806358fbcde59def38852ebeaca40ebde6e6a8fdf0de438d30a0
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild b/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild
deleted file mode 100644
index 904ee87c07b4..000000000000
--- a/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Guide the blob along the conveyer belt collecting the red blobs"
-HOMEPAGE="http://www.cloudsprinter.com/software/conveysdl/"
-SRC_URI="http://www.cloudsprinter.com/software/conveysdl/${P/-/.}.tar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# Incomplete readme
-	sed -i \
-		-e 's:I k:use -nosound to disable sound\n\nI k:' \
-		readme || die
-
-	sed -i \
-		-e 's:SDL_Mi:SDL_mi:' \
-		main.c || die
-
-	eapply \
-		"${FILESDIR}"/${P}-arrays.patch \
-		"${FILESDIR}"/${P}-speed.patch
-}
-
-src_compile() {
-	emake main \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} $(sdl-config --cflags) \
-			-DDATA_PREFIX=\\\"/usr/share/${PN}/\\\" \
-			-DENABLE_SOUND" \
-		LDLIBS="-lSDL_mixer $(sdl-config --libs)"
-}
-
-src_install() {
-	newbin main ${PN}
-	insinto /usr/share/${PN}
-	doins -r gfx sounds levels
-	newicon gfx/jblob.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Convey /usr/share/pixmaps/${PN}.bmp
-	einstalldocs
-}
diff --git a/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild b/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild
new file mode 100644
index 000000000000..a45ec62f1a9e
--- /dev/null
+++ b/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Guide the blob along the conveyer belt collecting the red blobs"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="
+	mirror://gentoo/${P/-/.}.tar
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-arrays.patch
+	"${FILESDIR}"/${P}-audio.patch
+	"${FILESDIR}"/${P}-speed.patch
+)
+
+src_compile() {
+	tc-export CC
+
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags sdl SDL_mixer || die) \
+		-DDATA_PREFIX="'\"${EPREFIX}/usr/share/${PN}/\"'" \
+		-DENABLE_SOUND
+	append-libs $($(tc-getPKG_CONFIG) --libs sdl SDL_mixer || die)
+
+	emake main LDLIBS="${LIBS}"
+}
+
+src_install() {
+	newbin main ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r gfx levels sounds
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} Convey
+
+	dodoc readme
+}
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
index a6286d96f145..b733159425e6 100644
--- a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
@@ -1,29 +1,18 @@
---- a/main.c.org	2010-07-28 13:16:20.552161148 +0300
-+++ b/main.c	2010-07-29 20:43:14.714543259 +0300
-@@ -22,7 +22,7 @@
- 
- SDL_Surface *bletters;
+https://bugs.gentoo.org/330161
+--- a/main.c
++++ b/main.c
+@@ -24,3 +24,3 @@
  SDL_Surface *letters[100];
 -SDL_Surface *tiles[9];
 +SDL_Surface *tiles[10];
  SDL_Surface *btiles;
- SDL_Surface *blob;
- SDL_Surface *jblob;
-@@ -51,7 +51,7 @@
- FILE *file_ptr;
- 
+@@ -53,3 +53,3 @@
  
 -int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[7],bloby[7],blobp[7],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
 +int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
  /* Keys */
- int quit = 0;
- int spacebar = 0;
-@@ -452,7 +452,7 @@
- static void info(void)
- {
+@@ -454,3 +454,3 @@
    int monkey=70,munk;
 -  char scoremonkey[10];
 +  char scoremonkey[16];
    if (lives>1) {
-     for (munk=1 ; munk<lives ; munk++ )
-     {
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch b/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch
new file mode 100644
index 000000000000..9f76cb2dc0a9
--- /dev/null
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch
@@ -0,0 +1,15 @@
+Fix header and add lacking instructions to readme.
+--- a/main.c
++++ b/main.c
+@@ -8,3 +8,3 @@
+ #ifdef ENABLE_SOUND
+-#include <SDL_Mixer.h>
++#include <SDL_mixer.h>
+ static int soundv = 2;
+--- a/readme
++++ b/readme
+@@ -6,2 +6,4 @@
+ 
++use -nosound to disable sound
++
+ I knocked this game up over a couple of days, and can't be
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
index 6d6d13eb11be..06d518597d94 100644
--- a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
@@ -1,31 +1,20 @@
---- a/main.c	2010-07-30 10:41:21.392783010 +0300
-+++ b/main.c	2010-07-30 10:44:35.791690958 +0300
-@@ -52,6 +52,7 @@
- 
- 
+https://bugs.gentoo.org/330161
+--- a/main.c
++++ b/main.c
+@@ -54,2 +54,3 @@
  int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
 +int realspeed;
  /* Keys */
- int quit = 0;
- int spacebar = 0;
-@@ -140,6 +141,7 @@
-   char path[256],jib[50];
-   int lvspx,lvspy;
+@@ -142,2 +143,3 @@
    bpointx=200;bpointy=400;pointx=200;pointy=400;jug=1;death=0;jump=0;jumpf=0;jug=0;blibs=0;blibo=0;die=0;speed=4;
 +  realspeed=speed;
    strcpy(path, DATA_PREFIX);
-   sprintf(jib,"levels/level%d",level);
-   strcat(path, jib);
-@@ -212,15 +214,16 @@
-     if (jumpf==jumpoo) { jump=0; }
-     if (jumpf==jumpoo*2) { jumpf=0; }
+@@ -214,3 +216,3 @@
    }
 -  score+=speed;
 +  score+=realspeed;
    /*crap*/
- }
- 
- static void plotfloor(void)
+@@ -220,5 +222,6 @@
  {
 +  if (bpointy==400) realspeed=speed;
    int nob,nx,nobx=48,ek,ej,el;
@@ -34,23 +23,13 @@
 +  bpointx-=realspeed*2;
 +  bpointy+=realspeed;
    pointx=bpointx;
-   pointy=bpointy;
-   imageplot(bb, blobx[6], bloby[6] );
-@@ -542,7 +545,7 @@
-   }
-   while ( jump_down==0 );
+@@ -544,3 +547,3 @@
    leveldone=3;
 -  speed=4;
 +  speed=4; realspeed=speed;
     blankscreen();
- }
- 
-@@ -563,7 +566,7 @@
-    if (quit>0) break;
-   }
+@@ -565,3 +568,3 @@
    while ( jump_down==0 );
 -  speed=4;
 +  speed=4; realspeed=speed;
    lives+=1;
-   level+=1;
-   getlevel();
diff --git a/games-arcade/criticalmass/Manifest b/games-arcade/criticalmass/Manifest
index c42713f0fa9e..316537cbfffc 100644
--- a/games-arcade/criticalmass/Manifest
+++ b/games-arcade/criticalmass/Manifest
@@ -1,8 +1,7 @@
-AUX criticalmass-1.0.2-cflags.patch 868 BLAKE2B 5e4179592ab03bbc34e14e7649ebfca2268a8f22728f7afb92f4978aeb09461588b7daa6642fa07c8ce007597ee40296d28c44b9381bc734184c5c82f6eb2106 SHA512 545f822a3fb2709c52e4c9bbacc8ea56a7aee229acdaec1af3024928d67395de8f3f0014b5647bb48afa1a85478854945490c482c96486e908c5342eba2538e9
-AUX criticalmass-1.0.2-gcc43.patch 3150 BLAKE2B c039896207f59cc4e0c4c4e81ced2266ca91c4731cb853c6e4120b1962cef0b7ebce1094d0b38081fbec44c098d3e109fe3a2e2d294c483caf1008611c4a5209 SHA512 a3a23367de54d99b3e47951477c3c85fa861a6a48c3a2d81e2352e55d0a32d6c319f5fd37ff287c93a5b9b0dfa230c89a90a507219960bb72a567977058f3bd6
-AUX criticalmass-1.0.2-libpng14.patch 449 BLAKE2B e27405000136410be47bb241208c1321bbbf8540b8707244271e9368cfaaf7cd058172cc952ff0dd1d84a5e693f0373f2ec8ddd47db1b05b8768f242fa037488 SHA512 976cb237901945119fe54bf8b7e8856d70d7104ff7071b80cdeb7fdab64e783c3f69a6099bd1ee11aae2eb5bd94dcac681869328e44bb74c4808b3c67a23e975
-AUX criticalmass-1.0.2-libpng15.patch 686 BLAKE2B a96af03a21e1e12606acd4ea07631c9688d80b377d126b44e1ace016e5aa727446d2c8c18606983fa6b2288f83b19130488e96e4f3364dc1e2d42b543d1e3766 SHA512 c2a68f80f0f775e5b6acbb6ed3a565200f481c83f505320488073783a30265769ba32f545590f2756a1d4974b0cc65462f559f23237ce206cfb80be370195d97
-AUX criticalmass-1.0.2-system_curl.patch 976 BLAKE2B 8af3bae1f2653e882a8d2f0955ef7973af93058bcf646f2264ccacc7b804a622b6104c50cbfc5531775bd9da22660317d2fb00804566014f543ef8e5a1d231be SHA512 6ce040132b9b3a4d4cf7a14c48a3e33320cd95ae440512f8c1c78e78200e6936fe95140e1e16607a225ec0ed1421e03bc09ba065552bc5419cbb42ac74f44b47
+AUX criticalmass-1.0.2-flags.patch 510 BLAKE2B ce561318375725702e28dcecd0da17bf0a0f87d214a17ddfd275af10701ca8e121621d20973df684af934fb6babe6acb158c3382a1a3509d4001ceab761146b8 SHA512 d953c639e2dae75d6e2638daa52c0dd322e3a059277dc71cacb0e9345ae3601e95895c75b8c33fea687658608530126a50d6d15b604172d1df938a6912966593
+AUX criticalmass-1.0.2-gcc43.patch 878 BLAKE2B c66f75c86894f99a9b60b9bbdb545a56c9d98ceb7c67e306cfee489d7fc825863bc31c9e55a5f3f0799b3ca7f799df94c31348db91c9725c2f3e15867e3450fe SHA512 b02c1580b7f0e9d3a57345e08817857bee81f6b8f821081d71ca5dc538e2c57eb9688c660ad5c200f46110f39e94e76f8bce5f2b237ccd0586f063dbdb0396fe
+AUX criticalmass-1.0.2-libpng.patch 767 BLAKE2B 489aed2c08011dd48c97491150b78b520fa91b57b6e1a4b8e29afa4bb1e3ff013b3c1cc3dfbd931d6056b54c6c93f5eb45d19bb6226a1e51f7a946f65f68cdcf SHA512 a33d54c8353311c01639368c5522d3ac6c4fdef802303f0df878065a82282ef705c24be370358ddc19abfd3cc824d706738923342643df80a2dcbfebcbd50edb
+AUX criticalmass-1.0.2-system-curl.patch 619 BLAKE2B 7e0df192cf53b9ab3b6b860e7e06091622c1d803b93001766c006e0b2c85a32da38be3aa4ac79c6e11dd57ccd434efc380b360013054ef57c37cad3c8354a796 SHA512 b4e6ae1d4c3a529b3bc2dff438813cddbfa1b97aa2b824dec0ab1030feda7f81a44586dbf0df80ef4b75fe8106daf97444df85199fe168ef79fe414e8cbfd8ff
 DIST CriticalMass-1.0.2.tar.bz2 5122126 BLAKE2B 91642309270aa9a76c1639b213b14f5b1feecce9a1bd9a516b84618e33d454542e31a34ffc974bb0e584b2ff5d5bad6b9112906a0c818662df7eb1ad0d812470 SHA512 af3200adc4b6ed9f24eaa89ef5b2f31e8d09e402d0c2eef8db604afcbb2d36bad48e76c3c11c1b2410d2d4e0ffd8554e2e9749a8c8cc4752b4636b8919a66037
-EBUILD criticalmass-1.0.2-r1.ebuild 1277 BLAKE2B 1d5b5a0b6941f8aab5ebcb29660e245d82a8db33046cf39b33efad6dbefb1d022413383540cb51f7948a8bbefea8057fafcd2afdc37c21e471e28a640e0c7064 SHA512 b0560a8d03dc9dc3b921d421949fcc3314055605d69af9ce20d354547a189819300fc36d01aaa919a8806f9ade279f5ef9660581b368be6405e01481eafc747f
+EBUILD criticalmass-1.0.2-r2.ebuild 1042 BLAKE2B 51826c148183c1b8ba53ba29edd6b00fc77bfb23d0e09070bce711e16ff311769686afb2cf6ff2d669b90cc425dff2f6f6ac1f348945efd3f98a35cf60ea2b15 SHA512 eb191b24b563aebc30ce508aa68c8273fa2ede8522004dd6dde3c18bfe9133fce6fd5d04438320687dda6cb57d1bfc8fd70277a537eade53aa4eea588d3cbd9a
 MISC metadata.xml 336 BLAKE2B ab745e031c331036c976bdc93264f212e9535e5e338a57c5d03b1e88321bf32f7301cbb632a368629ea68e211f15c784bb3542aa607b9731b3d3018cc3d056ec SHA512 8190699a3e41b2d66670117038d9446f4a70e745eeaaeec50161a9e9c8a60c254c3e31c251cf43518a013f9eb5458042db2b10841ab5b1b8a3a24418b1c86f7c
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild
deleted file mode 100644
index 5191beb0107f..000000000000
--- a/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic
-
-DESCRIPTION="SDL/OpenGL space shoot'em up game"
-HOMEPAGE="http://criticalmass.sourceforge.net/"
-SRC_URI="mirror://sourceforge/criticalmass/CriticalMass-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/sdl-mixer
-	media-libs/sdl-image[png]
-	media-libs/libpng:0=
-	virtual/opengl
-	net-misc/curl
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/CriticalMass-${PV}"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-system_curl.patch \
-		"${FILESDIR}"/${P}-libpng14.patch \
-		"${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-
-	rm -rf curl
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=gnu++98 # Bug 612758
-	default
-}
-
-src_install() {
-	HTML_DOCS="Readme.html"
-	default
-	rm -f "${ED}/usr/bin/Packer"
-	newicon critter.png ${PN}.png
-	make_desktop_entry critter "Critical Mass"
-}
-
-pkg_postinst() {
-	if ! has_version "media-libs/sdl-mixer[mod]" ; then
-		ewarn
-		ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer"
-		ewarn "with the \"mod\" USE flag turned on."
-		ewarn
-	fi
-}
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..550a1493e02e
--- /dev/null
+++ b/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop flag-o-matic
+
+MY_P="CriticalMass-${PV}"
+
+DESCRIPTION="SDL/OpenGL space shoot'em up game"
+HOMEPAGE="https://criticalmass.sourceforge.io/"
+SRC_URI="mirror://sourceforge/criticalmass/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+ ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libglvnd[X]
+	media-libs/libpng:=
+	media-libs/libsdl[opengl,sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[mod]
+	net-misc/curl
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-system-curl.patch
+	"${FILESDIR}"/${P}-libpng.patch
+	"${FILESDIR}"/${P}-flags.patch
+)
+
+src_prepare() {
+	default
+
+	rm -r curl || die
+	eautoreconf
+
+	append-cxxflags -std=gnu++98 #612758
+}
+
+src_install() {
+	local HTML_DOCS="Readme.html"
+	default
+
+	rm "${ED}"/usr/bin/Packer || die #247449
+
+	newicon critter.png ${PN}.png
+	make_desktop_entry critter "Critical Mass"
+}
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
deleted file mode 100644
index 0d9063c37538..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/configure.in.orig	2011-07-20 11:23:19.849122541 -0400
-+++ b/configure.in	2011-07-20 11:24:28.169713094 -0400
-@@ -35,9 +35,6 @@
- AM_CONDITIONAL(APPLE,test "x$TARGET" = xAPPLE)
- AM_CONDITIONAL(WIN32,test "x$TARGET" = xWIN32)
- 
--CFLAGS=""
--CXXFLAGS=""
--
- if test "x$GCC" = xyes; then
-    CFLAGS="$CFLAGS -W -Wall"
-    CXXFLAGS="$CXXFLAGS -W -Wall -fno-exceptions"
-@@ -51,14 +48,6 @@
-         CXXFLAGS="$CXXFLAGS -g"
- fi
- 
--AC_ARG_ENABLE(optimize,
--[  --enable-optimize=level      Enable optimization [default=2]],
--        enable_optmize=$enableval, enable_optimize=2)
--if test "x$enable_optimize" != "xno" ; then
--        CFLAGS="$CFLAGS -O$enable_optimize"
--        CXXFLAGS="$CXXFLAGS -O$enable_optimize"
--fi
--
- AC_ARG_ENABLE(dyngl,
- [  --enable-dyngl               Load GL library dynamically [default=off]],
-         enable_dyngl=$enableval, enable_dyngl=off)
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch
new file mode 100644
index 000000000000..5677211c78a2
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/375739
+--- a/configure.in
++++ b/configure.in
+@@ -24,2 +24,3 @@
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+@@ -37,5 +38,2 @@
+ 
+-CFLAGS=""
+-CXXFLAGS=""
+-
+ if test "x$GCC" = xyes; then
+@@ -52,10 +50,2 @@
+ fi
+-
+-AC_ARG_ENABLE(optimize,
+-[  --enable-optimize=level      Enable optimization [default=2]],
+-        enable_optmize=$enableval, enable_optimize=2)
+-if test "x$enable_optimize" != "xno" ; then
+-        CFLAGS="$CFLAGS -O$enable_optimize"
+-        CXXFLAGS="$CXXFLAGS -O$enable_optimize"
+-fi
+ 
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch
index e57c11f5af28..82207f52aec0 100644
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch
@@ -1,101 +1,46 @@
---- CriticalMass-1.0.0.orig/tinyxml/tinyxml.cpp	2003-03-03 03:34:58.000000000 +0100
-+++ CriticalMass-1.0.0/tinyxml/tinyxml.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -21,10 +21,12 @@
- distribution.
- */
- 
- #include "tinyxml.h"
+https://bugs.gentoo.org/218299
+--- a/tinyxml/tinyxml.cpp
++++ b/tinyxml/tinyxml.cpp
+@@ -25,2 +25,4 @@
  
 +#include <cstring>
 +
  
- TiXmlNode::TiXmlNode( NodeType _type )
- {
- 	parent = 0;
- 	type = _type;
---- CriticalMass-1.0.0.orig/tinyxml/tinyxml.h	2003-03-03 03:34:58.000000000 +0100
-+++ CriticalMass-1.0.0/tinyxml/tinyxml.h	2008-04-18 19:40:35.000000000 +0200
-@@ -28,10 +28,11 @@
- #ifdef _MSC_VER
- #pragma warning( disable : 4530 )
- #pragma warning( disable : 4786 )
- #endif
+--- a/tinyxml/tinyxml.h
++++ b/tinyxml/tinyxml.h
+@@ -32,2 +32,3 @@
  
 +#include <cstdlib>
  #include <string>
- #include <stdio.h>
- #include <assert.h>
- 
- class TiXmlDocument;
---- CriticalMass-1.0.0.orig/tinyxml/tinyxmlparser.cpp	2003-03-03 03:34:58.000000000 +0100
-+++ CriticalMass-1.0.0/tinyxml/tinyxmlparser.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -23,10 +23,12 @@
- 
- 
- #include "tinyxml.h"
- #include <ctype.h>
+--- a/tinyxml/tinyxmlparser.cpp
++++ b/tinyxml/tinyxmlparser.cpp
+@@ -27,2 +27,4 @@
  
 +#include <cstring>
 +
  const char* TiXmlBase::SkipWhiteSpace( const char* p )
- {
- 	while ( p && *p && 
- 	        ( isspace( *p ) || *p == '\n' || *p == '\r' ) )
- 		p++;
---- CriticalMass-1.0.0.orig/utils/ResourceManager.cpp	2005-01-02 03:59:29.000000000 +0100
-+++ CriticalMass-1.0.0/utils/ResourceManager.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -20,10 +20,12 @@
- #include <ResourceManager.hpp>
- #include <FindHash.hpp>
- #include <Endian.hpp>
- #include <WalkDirectory.hpp>
+--- a/utils/ResourceManager.cpp
++++ b/utils/ResourceManager.cpp
+@@ -24,2 +24,4 @@
  
 +#include <cstring>
 +
  #ifdef WIN32
- const char PATH_SEPERATOR = '\\';
- #else
- const char PATH_SEPERATOR = '/';
- #endif
---- CriticalMass-1.0.0.orig/utils/Value.hpp	2004-12-18 03:41:24.000000000 +0100
-+++ CriticalMass-1.0.0/utils/Value.hpp	2008-04-18 19:40:35.000000000 +0200
-@@ -13,10 +13,11 @@
- // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
- //
- #ifndef _Value_hpp_
- #define _Value_hpp_
+--- a/utils/Value.hpp
++++ b/utils/Value.hpp
+@@ -17,2 +17,3 @@
  
 +#include <cstdlib>
  #include <stdio.h>
- #include <string>
- 
- #include <Trace.hpp>
- 
---- CriticalMass-1.0.0.orig/utils/zStreamBufferImplZLib.cpp	2005-07-31 22:06:14.000000000 +0200
-+++ CriticalMass-1.0.0/utils/zStreamBufferImplZLib.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -10,10 +10,11 @@
- //
- // This program is distributed in the hope that it will be useful,  but  WITHOUT
- // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+--- a/utils/zStream.cpp
++++ b/utils/zStream.cpp
+@@ -14,2 +14,3 @@
  //
 +#include <cstdlib>
  #include <Trace.hpp>
- #include <zStreamBufferImplZLib.hpp>
- 
- bool ziStreamBufferImplZLib::init( void)
- {
---- CriticalMass-1.0.0.orig/utils/zStream.cpp	2005-07-31 22:06:14.000000000 +0200
-+++ CriticalMass-1.0.0/utils/zStream.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -10,10 +10,11 @@
- //
- // This program is distributed in the hope that it will be useful,  but  WITHOUT
- // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+--- a/utils/zStreamBufferImplZLib.cpp
++++ b/utils/zStreamBufferImplZLib.cpp
+@@ -14,2 +14,3 @@
  //
 +#include <cstdlib>
  #include <Trace.hpp>
- #include <Endian.hpp>
- #include <zStream.hpp>
- #include <zStreamBufferImplLZMA.hpp>
- #include <zStreamBufferImplZLib.hpp>
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch
new file mode 100644
index 000000000000..c2ea21bb2d63
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/206258
+https://bugs.gentoo.org/383207
+--- a/configure.in
++++ b/configure.in
+@@ -101,3 +101,3 @@
+     CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
+-	AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed))
++	AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed))
+ 	AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed))
+--- a/game/main.cpp
++++ b/game/main.cpp
+@@ -30,2 +30,4 @@
+ 
++#include <zlib.h>
++
+ void migrateConfig( void)
+--- a/utilssdl/PNG.cpp
++++ b/utilssdl/PNG.cpp
+@@ -47,3 +47,3 @@
+ 
+-    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
++    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
+     if( check != length)
+@@ -74,3 +74,3 @@
+ 
+-    if( setjmp(_png->jmpbuf))
++    if( setjmp(png_jmpbuf(_png)))
+     {
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
deleted file mode 100644
index f8a0eec2ad57..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -99,7 +99,7 @@ if test "x$TARGET" = xWIN32; then
- else
-     LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS"
-     CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
--	AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed))
-+	AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed))
- 	AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed))
- 	if test "x$TARGET" = xUNIX; then
- 	    if test "x$enable_dyngl" = xoff; then
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
deleted file mode 100644
index dbdfc9f32275..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/game/main.cpp
-+++ b/game/main.cpp
-@@ -28,6 +28,8 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- 
-+#include <zlib.h>
-+
- void migrateConfig( void)
- {
-     //if onlineCheck is not set, default it to true
---- a/utilssdl/PNG.cpp
-+++ b/utilssdl/PNG.cpp
-@@ -45,7 +45,7 @@
- {
-     png_size_t check;
- 
--    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
-+    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
-     if( check != length)
-     {
- 	png_error( png, "Write Error");
-@@ -72,7 +72,7 @@
- 	return false;
-     }
- 
--    if( setjmp(_png->jmpbuf))
-+    if( setjmp(png_jmpbuf(_png)))
-     {
- 	fclose( fp);
- 	png_destroy_write_struct(&_png, (png_infopp)NULL);
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-system-curl.patch
index 1ab1a2d5ce52..084efbc05cf2 100644
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-system-curl.patch
@@ -1,33 +1,21 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,3 +6,3 @@
+ ## Any directories that you want built and installed should go here.
+-SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
++SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
+ 
 --- a/configure.in
 +++ b/configure.in
-@@ -115,8 +115,6 @@ fi
- AC_CHECK_LIB(m, sin,, 
-     AC_MSG_ERROR(libm is needed))
+@@ -121,4 +121,2 @@
  
 -AC_CONFIG_SUBDIRS(curl)
 -
  AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile)
- 
- echo "Configuration:
 --- a/game/Makefile.am
 +++ b/game/Makefile.am
-@@ -41,7 +41,7 @@ critter_SOURCES = \
-         main.cpp
- 
+@@ -43,3 +43,3 @@
  LDADD = \
 -	../curl/lib/libcurl.a \
 +	-lcurl \
  	../utils/libutils.a \
- 	../utilssdl/libutilssdl.a \
- 	../utilsgl/libutilsgl.a \
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,7 +4,7 @@
- AUTOMAKE_OPTIONS = 1.4
- 
- ## Any directories that you want built and installed should go here.
--SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
-+SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
- 
- ## Any directories you want a part of the distribution should be listed
- ## here, as well as have a Makefile generated at the end of configure.in
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 49940fae8d6d..340b3ff11e10 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 6636e40217a6..b1ae4522782a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Aug 2022 18:40:01 +0000
+Fri, 12 Aug 2022 00:39:57 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 7d7fff83c076..db71d89acb46 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 521770 BLAKE2B c2acb8c863b2efce05519b69900dc397016a5ee5af4af18fda8ac25353a157eb4632e81d3a44a9e724b472ac3f520214dc9c6708619ea63041d0b272f7a9be10 SHA512 6eb592a988ac90c24adf99f6fcb0f9a848c75aa47fdc37e5dbf4ebafea5daf193d2bf7928130322630437e54a2d9a93d5dd6a6ed7658bde2da05b340db2721c7
-TIMESTAMP 2022-08-11T18:40:04Z
+TIMESTAMP 2022-08-12T00:40:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL1TQRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL1oWFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDXiw/9EtWGR2pOAGmS/eHR5n01KO0LwL8VgcqHn5TP/xsejh8XLV4N2apT8Ern
-90712UCYaQOa5XM1zDIfURKX97BElm8RMjm69a+aq8bhDxIvBfM+X6H6k6zfLkgJ
-40hR8stfY7njYn3x2rlZlfehr5wSVzQ651O5FfpIaeJtz4cGNmXswntBVu8NfnpV
-BTq5ggm1VCkHgDYnQM6N7cuBS2DgspIGbFofZGthKflbGpT0v59A13FxZCGtxStG
-8PhGSSXfk9oCnGOU44lDvdxnNUlmQaFKpA4wCu7Xlrih0eloXjz/8VeqsewXrJwl
-PGe7gPym6o+bCc9o36ZsL/CjLBljba3jbcTAahmtmKF8vLjW5IbtR0bsr+MYCILH
-dF0Q8nPSVqZtwuxX1P/K/8hztI1PcwimnIcm/0hOO/mEj6Fd8avRsm2UGCuCEeQp
-OK1XlEN3+kGzTlUuc90ADqlwvnTVLnzrXD/ZvqZxLOMBv04QGIQmh2shDkGol8s0
-LBJztB+rxNxDkqv1Qr1G/tZjLrgnlrywHw8ESwfWWpIVYUrsTw4tWQxE9/RtofQ/
-0btUJ63jtEv6c9Hvqjui1nKM7JF8bEzNOuH0YbM0hcbxDYwq6CcTsfUd0tIV3QYU
-qTaCuGgLVDsqx+NwnWD8Wqv5tyWQ9tgiPwTUNBR2jz3W8M/w8dY=
-=J73h
+klDEnRAAnJh7qx9ljf96Z10ZQ+zvCe995WNqXjz3p/tcltiRLHmykM8wIwSItIYa
+wb2TBDqagge1RlgvOCy78r1fKTlhtKewcHUDZc78ad8yhEdOiP+Gvc1R7CL14n6r
+33YDqPTa35dL/O9vkGv5pkR71bE/Vl8myozdpTOvhfkEkXjS4gT/apMLkWP4pemi
+A66niNqHkWe1iwBIChM5a4HU5LFrLdXq+Xw79TtX0NE3KOU4ZUsRN3nRiSlVlfXa
+zUSU2PS+QFioXjWopLPdrJkujjqjuXpAvdtSTrCGQbkm69dZEhLvzM71KDrobprD
+8N7jUWpijN92QEU4OPLjRqgXxZyLzGlRJK8cdKToKDAyITy1TJrjRUSMSdT+CLfn
+r5dsZdJp3kr07W/WN/vPi2wiadUm01mmU0i1ABlwGURLAr4+VNt7L3vRdfl03vHa
+N9BLu7Bnfks6hZKE1wf13TeToMi+jHGizDxUFS7G/qj7PJiLlIwsIjIxlqUCVJWK
+dYw5Lk8km316viBZuITXaKYJlUo2VmArZKkfMLs+AazzOXKXdz5H8qPcWTwx8q2R
+pMGTxa1Np27sM5P1Vl9Uh4PIEL3YQe0NTTgeFZxDPE5ISJ5Fi/P2d01Oza7NYRlF
+mAuC8zZnwN1FIjzgjVbbFG3vdcskAmr8OeveGXxMcfZLQ9YDtwQ=
+=UgUQ
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 6636e40217a6..23de03cde368 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Aug 2022 18:40:01 +0000
+Fri, 12 Aug 2022 00:39:58 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index fa36a8e22841..b5e6041bfb0e 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 51532b1fe5a5..4c1f238ebb27 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/vkd3d-1.4 b/metadata/md5-cache/app-emulation/vkd3d-1.4
new file mode 100644
index 000000000000..99e2b935d41f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/vkd3d-1.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=spirv-tools? ( dev-util/spirv-tools:=[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/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] x11-libs/xcb-util:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-wm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/spirv-headers dev-util/vulkan-headers
+DESCRIPTION=D3D12 to Vulkan translation library
+EAPI=6
+HOMEPAGE=https://source.winehq.org/git/vkd3d.git/
+INHERIT=multilib-minimal
+IUSE=spirv-tools 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 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=spirv-tools? ( dev-util/spirv-tools:=[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/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] x11-libs/xcb-util:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-wm:=[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=0
+SRC_URI=https://dl.winehq.org/vkd3d/source/vkd3d-1.4.tar.xz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=97e81ac5ad80cc87177c2285d898898f
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 979f8eaefd3c..dd80bef06446 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/balloonchase-0.9.6-r1 b/metadata/md5-cache/games-arcade/balloonchase-0.9.6-r2
index bb38de45d123..2147d73bd55a 100644
--- a/metadata/md5-cache/games-arcade/balloonchase-0.9.6-r1
+++ b/metadata/md5-cache/games-arcade/balloonchase-0.9.6-r2
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install prepare
 DEPEND=media-libs/libsdl[video]
 DESCRIPTION=Fly a hot air balloon and try to blow the other player out of the screen
-EAPI=6
-HOMEPAGE=http://makegho.mbnet.fi/c/bchase/
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=desktop toolchain-funcs
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=media-libs/libsdl[video]
 SLOT=0
-SRC_URI=http://makegho.mbnet.fi/c/bchase/balloonchase-0.9.6.tar.bz2
+SRC_URI=mirror://gentoo/balloonchase-0.9.6.tar.bz2 https://dev.gentoo.org/~ionen/distfiles/balloonchase.png
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1b835598566c112f11445778d80ade2d
+_md5_=a904a3e163e97148ebb9c7f15ef54384
diff --git a/metadata/md5-cache/games-arcade/cob-0.9-r1 b/metadata/md5-cache/games-arcade/cob-0.9-r2
index dd90e6ea16a7..4d35a4eda92e 100644
--- a/metadata/md5-cache/games-arcade/cob-0.9-r1
+++ b/metadata/md5-cache/games-arcade/cob-0.9-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install
 DEPEND=media-libs/libsdl[joystick,sound,video]
 DESCRIPTION=Cruising on Broadway: a painting-type game
-EAPI=6
-HOMEPAGE=http://www.autismuk.freeserve.co.uk/
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=desktop
 KEYWORDS=~alpha ~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=media-libs/libsdl[joystick,sound,video]
 SLOT=0
-SRC_URI=http://www.autismuk.freeserve.co.uk/cob-0.9.tar.gz
+SRC_URI=mirror://gentoo/cob-0.9.tar.gz https://dev.gentoo.org/~ionen/distfiles/cob.png
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
-_md5_=9ba628d844d062ef52589194760298d2
+_md5_=5f003ea20fd2580eebc8b614a8e052f1
diff --git a/metadata/md5-cache/games-arcade/conveysdl-1.3-r1 b/metadata/md5-cache/games-arcade/conveysdl-1.3-r1
deleted file mode 100644
index 8a7ccf4499af..000000000000
--- a/metadata/md5-cache/games-arcade/conveysdl-1.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer
-DESCRIPTION=Guide the blob along the conveyer belt collecting the red blobs
-EAPI=6
-HOMEPAGE=http://www.cloudsprinter.com/software/conveysdl/
-INHERIT=desktop toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer
-SLOT=0
-SRC_URI=http://www.cloudsprinter.com/software/conveysdl/conveysdl.1.3.tar
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6c596b3fe88ab341dfdfd2e35df128ed
diff --git a/metadata/md5-cache/games-arcade/conveysdl-1.3-r2 b/metadata/md5-cache/games-arcade/conveysdl-1.3-r2
new file mode 100644
index 000000000000..6a42f3c3c088
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/conveysdl-1.3-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer
+DESCRIPTION=Guide the blob along the conveyer belt collecting the red blobs
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=desktop flag-o-matic toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer
+SLOT=0
+SRC_URI=mirror://gentoo/conveysdl.1.3.tar https://dev.gentoo.org/~ionen/distfiles/conveysdl.png
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=00699fbecfa7394a23d418978a5e8c0a
diff --git a/metadata/md5-cache/games-arcade/criticalmass-1.0.2-r1 b/metadata/md5-cache/games-arcade/criticalmass-1.0.2-r1
deleted file mode 100644
index 1ead67f3d2b3..000000000000
--- a/metadata/md5-cache/games-arcade/criticalmass-1.0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng:0= virtual/opengl net-misc/curl sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=SDL/OpenGL space shoot'em up game
-EAPI=6
-HOMEPAGE=http://criticalmass.sourceforge.net/
-INHERIT=autotools desktop flag-o-matic
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng:0= virtual/opengl net-misc/curl
-SLOT=0
-SRC_URI=mirror://sourceforge/criticalmass/CriticalMass-1.0.2.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=acfdd86e6ee6baad342aea13b4196563
diff --git a/metadata/md5-cache/games-arcade/criticalmass-1.0.2-r2 b/metadata/md5-cache/games-arcade/criticalmass-1.0.2-r2
new file mode 100644
index 000000000000..0c110bd8691f
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/criticalmass-1.0.2-r2
@@ -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 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libglvnd[X] media-libs/libpng:= media-libs/libsdl[opengl,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[mod] net-misc/curl sys-libs/zlib:=
+DESCRIPTION=SDL/OpenGL space shoot'em up game
+EAPI=8
+HOMEPAGE=https://criticalmass.sourceforge.io/
+INHERIT=autotools desktop flag-o-matic
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ ZLIB
+RDEPEND=media-libs/libglvnd[X] media-libs/libpng:= media-libs/libsdl[opengl,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[mod] net-misc/curl sys-libs/zlib:=
+SLOT=0
+SRC_URI=mirror://sourceforge/criticalmass/CriticalMass-1.0.2.tar.bz2
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0d59719a745b96f2397bcff1c3118db8
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 757f2e2ea1f3..665fcc57522a 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.36.0 b/metadata/md5-cache/net-analyzer/netdata-1.36.0
new file mode 100644
index 000000000000..ae22e47914f9
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netdata-1.36.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DESCRIPTION=Linux real time system monitoring, done right!
+EAPI=8
+HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
+INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
+IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3+ MIT BSD
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
+SLOT=0
+SRC_URI=https://github.com/netdata/netdata/releases/download/v1.36.0/netdata-v1.36.0.tar.gz -> netdata-1.36.0.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=71965a59e3fb0916f43802b870d4eac7
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 42db17d97453..ee13df0270c1 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.136 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.136
new file mode 100644
index 000000000000..38c6bdd8d229
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.136
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.136
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.136 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.136
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-145.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-145.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a0c5925db7cca827df47b0dc487cc306
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.209 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.209
index 07cbb8483246..2fb1f8a43aaf 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.209
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.209
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.kernel.org/
 INHERIT=kernel-build
 IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ppc64 ~x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.4.209
 RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.209 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.209
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-214.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-214.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
 _eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c3cd5e172a7b302c4c577302ac6b6687
+_md5_=f5a5e16132b682db22e10f58137ac7ee
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.210 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.210
new file mode 100644
index 000000000000..74c24777bf3f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.210
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.210
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.210 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.210
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-215.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-215.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c8c1b01bea11174259c4f13c0a99566b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.136 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.136
new file mode 100644
index 000000000000..f3d742f6007f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.136
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-install toolchain-funcs
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.136
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.136 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.136
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-145.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-145.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.136-1.xpak -> gentoo-kernel-5.10.136-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.136-1.xpak -> gentoo-kernel-5.10.136-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.136-1.xpak -> gentoo-kernel-5.10.136-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.136-1.xpak -> gentoo-kernel-5.10.136-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=37cf5e192c772ae5a043406dd66c89e2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.209 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.209
index 5f72507fe1e2..bfa7a8c54082 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.209
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.209
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.kernel.org/
 INHERIT=kernel-install toolchain-funcs
 IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ppc64 ~x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.4.209
 RDEPEND=!sys-kernel/gentoo-kernel:5.4.209 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.209
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-214.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-214.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209-1.xpak -> gentoo-kernel-5.4.209-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209-1.xpak -> gentoo-kernel-5.4.209-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209-1.xpak -> gentoo-kernel-5.4.209-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209-1.xpak -> gentoo-kernel-5.4.209-1.x86.xpak )
 _eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ebd6d1ac017f0e963d6e37bf0e416c5a
+_md5_=2077d665dc61b095c557a5614fb4dc6a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.210 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.210
new file mode 100644
index 000000000000..4d5711bddfa8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.210
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-install toolchain-funcs
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.210
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.210 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.210
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-215.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-215.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.210-1.xpak -> gentoo-kernel-5.4.210-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.210-1.xpak -> gentoo-kernel-5.4.210-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.210-1.xpak -> gentoo-kernel-5.4.210-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.210-1.xpak -> gentoo-kernel-5.4.210-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=66f65f93b9a9420d60fe92bf71b253aa
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.136 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.136
new file mode 100644
index 000000000000..1d253dbe059b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.136
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.136
+RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.136
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.136.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.136.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=0deb4fbc084410cfd4dced398b5403de
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.210 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.210
new file mode 100644
index 000000000000..73d0d10bdbac
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.210
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build verify-sig
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.210
+RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.210
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.210.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.210.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	9f89ee029a72742cecbcbf94122cb9cb	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=a0e6c3347fabaa58c7a38f82f31d884d
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index e10da568ac2a..514717e44c4f 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.136 b/metadata/md5-cache/virtual/dist-kernel-5.10.136
new file mode 100644
index 000000000000..8aa3e769a3e4
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.136
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.136 ~sys-kernel/gentoo-kernel-bin-5.10.136 ~sys-kernel/vanilla-kernel-5.10.136 )
+SLOT=0/5.10.136
+_md5_=8d5178e82e5992dcec134c02ff7397e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.209 b/metadata/md5-cache/virtual/dist-kernel-5.4.209
index 9db6b2412632..2d955b42d168 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.209
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.209
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ppc64 ~x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.209 ~sys-kernel/gentoo-kernel-bin-5.4.209 ~sys-kernel/vanilla-kernel-5.4.209 )
 SLOT=0/5.4.209
-_md5_=a81ef674c1ec3ce8090dc986ced1eaf3
+_md5_=ea418f616dfd6913246016a6bf09a886
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.210 b/metadata/md5-cache/virtual/dist-kernel-5.4.210
new file mode 100644
index 000000000000..ee2b1d5269a0
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.210
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.210 ~sys-kernel/gentoo-kernel-bin-5.4.210 ~sys-kernel/vanilla-kernel-5.4.210 )
+SLOT=0/5.4.210
+_md5_=a81ef674c1ec3ce8090dc986ced1eaf3
diff --git a/metadata/md5-cache/virtual/jdk-11-r2 b/metadata/md5-cache/virtual/jdk-11-r2
index c11d3a98b6a7..bb3cadc2ecf5 100644
--- a/metadata/md5-cache/virtual/jdk-11-r2
+++ b/metadata/md5-cache/virtual/jdk-11-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Java Development Kit (JDK)
 EAPI=7
 IUSE=headless-awt
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
 RDEPEND=|| ( dev-java/openjdk-bin:11[gentoo-vm(+),headless-awt=] dev-java/openjdk:11[gentoo-vm(+),headless-awt=] )
 SLOT=11
-_md5_=5a8cfa8a0040123913f36ba5b45adffd
+_md5_=3639a707018973d5f27c731d1a367e88
diff --git a/metadata/md5-cache/virtual/jdk-17 b/metadata/md5-cache/virtual/jdk-17
index b183d1489b18..cee30c73f2a8 100644
--- a/metadata/md5-cache/virtual/jdk-17
+++ b/metadata/md5-cache/virtual/jdk-17
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Java Development Kit (JDK)
 EAPI=8
 IUSE=headless-awt
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
 RDEPEND=|| ( dev-java/openjdk-bin:17[gentoo-vm(+),headless-awt=] dev-java/openjdk:17[gentoo-vm(+),headless-awt=] )
 SLOT=17
-_md5_=6549c0d7d3d3df95b476172431d0c69c
+_md5_=00d2063fc362de9bbbc24999426955b7
diff --git a/metadata/md5-cache/virtual/jre-11-r2 b/metadata/md5-cache/virtual/jre-11-r2
index a9f093fd1c3c..a19f72cf26e4 100644
--- a/metadata/md5-cache/virtual/jre-11-r2
+++ b/metadata/md5-cache/virtual/jre-11-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Java Runtime Environment (JRE)
 EAPI=7
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
 RDEPEND=|| ( virtual/jdk:11 dev-java/openjdk-jre-bin:11[gentoo-vm(+)] )
 SLOT=11
-_md5_=460c7c2318648154fba075182cc89ad3
+_md5_=bbbe2879cd9f866457bea274874d5df7
diff --git a/metadata/md5-cache/virtual/jre-17 b/metadata/md5-cache/virtual/jre-17
index 900b230e5f58..c9d24fae81de 100644
--- a/metadata/md5-cache/virtual/jre-17
+++ b/metadata/md5-cache/virtual/jre-17
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Java Runtime Environment (JRE)
 EAPI=8
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
 RDEPEND=|| ( virtual/jdk:17 dev-java/openjdk-jre-bin:17[gentoo-vm(+)] )
 SLOT=17
-_md5_=3563319080b5b5a5ccd39f8dc29ca38f
+_md5_=054b37e8fbce1a33803a0abf24ef343a
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 7cf6d433f5a8..a63afce4cd3a 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/vivaldi-5.3.2679.73 b/metadata/md5-cache/www-client/vivaldi-5.4.2753.28
index d8ad655b922e..23ce7c6ba6f3 100644
--- a/metadata/md5-cache/www-client/vivaldi-5.3.2679.73
+++ b/metadata/md5-cache/www-client/vivaldi-5.4.2753.28
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://vivaldi.com/
 INHERIT=chromium-2 desktop unpacker xdg
 IUSE=proprietary-codecs widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~arm ~arm64
+KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.73-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.73-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.4.2753.28-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.4.2753.28-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.4.2753.28-1_arm64.deb )
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a274c209fe27374a222656381ea42503
+_md5_=c91ac2d27bf30f3918339336bb7d010d
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2753.19 b/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2753.27
index 4712e8b13d69..68da732ea113 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2753.19
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2753.27
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2753.19-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2753.19-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2753.19-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2753.27-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2753.27-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2753.27-1_arm64.deb )
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c91ac2d27bf30f3918339336bb7d010d
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 8be13511a228..751d6a74453b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-08-11T18:40:04Z
+TIMESTAMP 2022-08-12T00:40:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL1TQRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL1oWFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD3jRAArqA9Xq6xqYrkh5Wdt7e0wBT46ECowRs+FB2uL7uJd+hceT74uJ6XSKHI
-H4nwtrQ2EVwIln81+S0TGtvJoaEVJOWB6a658w4txJWVA2XzTJQyrx3kiotf2nMQ
-MQMVIALzAkFOTu8rUfjk0QWaKjYOQjp2U14efYMRmI0ooZmh/4/cVqshvaYr3RGf
-i6wigIDMvlz+032K9ufdENKuky1QyYzZU89Dy3PW2D3E1J3Gwjk4BhUuydfvGVFG
-XNibKJkbgzWYmXZMU3F96vgX6q+lQ2xbwnDGXzJhbyG3z6m+C1LWDOd3tFFDodbv
-ZH9fbk3TL/WHsNJHIkFRbBw+qj+cDauE22RJFCa4wZ8IfyQyEf9n2IAUg8VoPjzL
-pJm3+S9ZPqZvFXoYSeebgSV8N84FQB+w6NR2gPO8JXHm/20tffkhTsNhcqQogXRM
-z+AeCviQXF8jjg1QNMNdH9IV+wyrbA8Ta8aDdQ8mKv4TUwmUHa6B1t6fakep+sdJ
-ZmFos3oW5fCziag+EuBccesh44cMz/7IQlqckgqgtNuL+4F0w59sk75m0bDWSwmO
-yvXuuPWb5XpaMBsDqlhgOiQNeFA8MOg/7YaEz8yRW+/nA8ZFDhi7Zn60325E+gF4
-Gb2TjUPLvGU5PicdQgNk1JnyoGqetUDXk0N198cUwyzBkyNcEls=
-=Fn2X
+klDIohAAiaqM0ITpCVoQik+1PojN9mFhd2TsrBlcpPM4nrF0J39qdCXb5OQnp3Q6
+sW9YDMo9r6yxfaaZsw4wMZzDqrDRsZMJORcIWJmdPRcisZFvgpQfEZPURObVf98E
+W4oDtrlxbPizJCnxKNCWRw98x2lpbUPvPWxfhdK09pfu3tT+WIGNOq9TfUTvF/qs
+KhPo6R16S/7uPEWFwqTgOh77d/27yjkHcxSXxOTdaR06133/M0M5ijOEO7k6nw3n
+9361hc6ofZbNV2oSqHfhVUUGbogEmEfVWT+mjcU+P5sGHH7wqmq7OPVAOxpPVQSM
+ToOm6i1avbBDHN9eRnn/Jg/ajra/O5cKM9PdKTnsXndDnJJtRj1MFpfWtm/ouBE9
+jiD/N3+0EG8TpF5PEDv5NZBnLUd9QnGN/v+6J1I4Z32GAqujksIUWKXnq0KUVdBB
+LnXqq9UK9/wbAB4HPKWsxuvDnzpRnQXVokT0KKu+LUI6slhSjvHEfVoX0oh2wwZT
+eJ2LANZ44NUAMwk2OR7fAzB7j46KihFbfeHfTjU87S7pxpBf55FTWABdsfGJmlHl
+3X7PEYQPBdI3HlvPTe9zXOR21LHT6yVqWNxTTZLjpihcJ5gutuFOeHt3Vdkf73nv
+jpyYyfoHWanP93ZvjFvyJuGKM8nWf0SBcQPa19TP/nR8iFMQQcw=
+=vUaU
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 6636e40217a6..23de03cde368 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Aug 2022 18:40:01 +0000
+Fri, 12 Aug 2022 00:39:58 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 6c3b4a2d3d23..7baf3f7a8527 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Aug 11 06:40:00 PM UTC 2022
+Fri Aug 12 12:39:57 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 0e2c9d9257ea..acea68098599 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Aug 2022 18:45:01 +0000
+Fri, 12 Aug 2022 00:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 7a7e750bc8ba..3168b4874fb8 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-106d5ab4c5c1ec11f14e74dfb0ebcc4b72197b53 1660242163 2022-08-11T18:22:43+00:00
+62866858f1f99e4c9c44608a553fe8da7d512302 1660260444 2022-08-11T23:27:24+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 42ec7aa13e7e..e401a29f6ef1 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1660243201 Thu 11 Aug 2022 06:40:01 PM UTC
+1660264801 Fri 12 Aug 2022 12:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 6636e40217a6..23de03cde368 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Aug 2022 18:40:01 +0000
+Fri, 12 Aug 2022 00:39:58 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 234f17a7ebbf..84228275d1ac 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 59ab74cff41c..01c4547855be 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,4 +1,6 @@
 DIST netdata-1.35.1.tar.gz 22335562 BLAKE2B a715f26f1318f01ce45266bbc78ada5ec2e3516f7ff2a6fda77829433398986bc564b377362097ea7c2595ac01911a817be124c9f0ba560dd00ae5001a080da7 SHA512 43cbf099841fe2547b7de56610f811e55fdf2e9af3dc18fde818e09de1125a7f8d57f6a16f2dee8ea4b9e6f2683959549810a1ea7f8f7b5007eb7069bfddb477
+DIST netdata-1.36.0.tar.gz 24794657 BLAKE2B f3230f5c279a5a203f9245a1d74f254961cafe060d285fcd63f968c5f33cd2c4393288c44262eb12665c6471d757d65a9a2406c7d80997736ada6189ba1c8450 SHA512 1748c5f6ea392b6cfc6b761632bc632422fb6910f53fb26a796003cdc0048f28ab550daa0658a6d5de5fec65b0a5aae8f44f68ec65c19f06b11eda6fd337c8d4
 EBUILD netdata-1.35.1.ebuild 3915 BLAKE2B ed0582d4ef9d60aa1fe7867b11c26883b1bdf8bd4d628acc8621bf3c98e2eb81dddf4ad23931f0dfaa1f237d5d8739387a2f6ee50e8caac2b479254ee1d32f4d SHA512 4296a274877e0df4929128b2992e079aba92e3a5f7c47e632b47c29c5f97973dbf671397bdcb938511bf50331023588a5b5eb5ad23b48813dde2021f251e4870
+EBUILD netdata-1.36.0.ebuild 3915 BLAKE2B ed0582d4ef9d60aa1fe7867b11c26883b1bdf8bd4d628acc8621bf3c98e2eb81dddf4ad23931f0dfaa1f237d5d8739387a2f6ee50e8caac2b479254ee1d32f4d SHA512 4296a274877e0df4929128b2992e079aba92e3a5f7c47e632b47c29c5f97973dbf671397bdcb938511bf50331023588a5b5eb5ad23b48813dde2021f251e4870
 EBUILD netdata-9999.ebuild 3915 BLAKE2B ed0582d4ef9d60aa1fe7867b11c26883b1bdf8bd4d628acc8621bf3c98e2eb81dddf4ad23931f0dfaa1f237d5d8739387a2f6ee50e8caac2b479254ee1d32f4d SHA512 4296a274877e0df4929128b2992e079aba92e3a5f7c47e632b47c29c5f97973dbf671397bdcb938511bf50331023588a5b5eb5ad23b48813dde2021f251e4870
 MISC metadata.xml 1289 BLAKE2B 8c18928662fdfb9166a3dd147b73206d41b6038268121b23b464f5e8ff8cacf929ac6374aa8b54b63281599be21dd92c352ac229a0e0ff180a57b86faf020ea2 SHA512 e3a344e81572b366848b51022febaeb9f9f5df3555343757061370dc42757817b4b77de85a4f0efb6b52032461cb97edd4b9d41b44b9cec7681b06448f706484
diff --git a/net-analyzer/netdata/netdata-1.36.0.ebuild b/net-analyzer/netdata/netdata-1.36.0.ebuild
new file mode 100644
index 000000000000..3df5ef6ecd47
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.36.0.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+
+inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-libs/libwebsockets
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	dev-libs/libuv
+	cloud? ( dev-libs/protobuf:= )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	jsonc? ( dev-libs/json-c:= )
+	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
+	mongodb? ( dev-libs/mongo-c-driver )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		dev-libs/protobuf:=
+		app-arch/snappy
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use ppc64; then
+		# bundled dlib does not support vsx on big-endian
+		# https://github.com/davisking/dlib/issues/397
+		[[ $(tc-endian) == big ]] && append-flags -mno-vsx
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		--without-bundled-protobuf \
+		$(use_enable cloud) \
+		$(use_enable jsonc) \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable kinesis exporting-kinesis) \
+		$(use_enable lto lto) \
+		$(use_enable mongodb exporting-mongodb) \
+		$(use_enable prometheus exporting-prometheus-remote-write) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_compile() {
+	emake clean
+	default
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+	fowners -Rc netdata:netdata /var/lib/netdata
+
+	fowners -Rc root:netdata /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use nfacct ; then
+		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
+	fi
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+
+	if use ipmi ; then
+	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
+	fi
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index cf07fa139821..f1ab69a09190 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/riscv/package.mask b/profiles/arch/riscv/package.mask
index ab795bdab09d..14d513dbb5bc 100644
--- a/profiles/arch/riscv/package.mask
+++ b/profiles/arch/riscv/package.mask
@@ -1,6 +1,11 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Yixun Lan <dlan@gentoo.org> (2022-08-11)
+# dev-java/openjdk support lp64d only, so mask others
+virtual/jdk
+virtual/jre
+
 # Arthur Zamarin <arthurzam@gentoo.org> (2022-04-30)
 # Bootstrapping was created only for lp64d
 dev-java/openjdk
diff --git a/profiles/arch/riscv/rv64gc/lp64d/package.mask b/profiles/arch/riscv/rv64gc/lp64d/package.mask
index 53f8d2598ac4..f08a2570a938 100644
--- a/profiles/arch/riscv/rv64gc/lp64d/package.mask
+++ b/profiles/arch/riscv/rv64gc/lp64d/package.mask
@@ -1,6 +1,11 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Yixun Lan <dlan@gentoo.org> (2022-08-11)
+# dev-java/openjdk support lp64d, unmask it
+-virtual/jdk
+-virtual/jre
+
 # Arthur Zamarin <arthurzam@gentoo.org> (2022-04-30)
 # Bootstrapping tarball was created for lp64d
 -dev-java/openjdk
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index 47955d113744..c90ad0cedaf6 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -62,6 +62,7 @@ games-puzzle/world-of-goo-hb
 games-roguelike/adom
 games-roguelike/neon-chrome
 games-rpg/costume-quest
+games-rpg/crosscode
 games-rpg/dear-esther
 games-rpg/dungeon-defenders
 games-rpg/eschalon-book-1-demo
@@ -77,6 +78,11 @@ games-strategy/knights-demo
 games-strategy/majesty-demo
 media-video/binkplayer
 
+# James Le Cuirot <chewi@gentoo.org> (2022-08-11)
+# Binary package for glibc. Could be built from source but would take ages and
+# isn't worth the maintenance cost.
+dev-libs/nwjs
+
 # Ian Stakenvicius, 2017-06-14
 # on behalf of mozilla@gentoo.org
 # Mask firefox-54 and above as it requires rust
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 9597f647966e..a8d05d70791c 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 d12d6f1cee4a..bf53f96e9b51 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,5 +1,7 @@
 DIST genpatches-5.10-144.base.tar.xz 3907764 BLAKE2B 41b8ce08ca73879811e11d91f9365ddfbbc15617a4b825ba00144e71feb86e0ef24b3418b77b203a13ad6299237085a2a1c796beb6ac9aa98a5990a39fd1dd02 SHA512 1b946439d9cf6d97df1acadd7b36ef657fac40ff98b31e2237f3cc412e9efd6d4d1d409339af9d48779dbd9d88aac124f67e07afcf99e7760f93afb6d226131c
 DIST genpatches-5.10-144.extras.tar.xz 3868 BLAKE2B 0d956a61fb525b8ce3b14c215a0c0a6ffa46f21fcf87a63884d31418946a64de0c680472a62fc9bc0d83f67b49dfe88ed373e3ff2ba2f369a0909e3947b27c16 SHA512 c870f84b1a4ae7b95518d08ab46fc7e632a47884e43a9c774be34335ebf825388136ed360f5129c8c97567600e79ce2889d64d9b60a1a8bd2a5b4052e74e2973
+DIST genpatches-5.10-145.base.tar.xz 3914420 BLAKE2B 0d6f00cfba2ea5bc70bf44549e82b79d8e7a59b8e34ad7b94dc97c0ab1059ad005b15d09ab51fd9dcf65243dbf0abc0221d26ee06708adacc7dcc7aa18e7939a SHA512 4b2cc1f37d0dee2bb8181be5ea4030b3c9f2035c688cba3e5d512584486158cd7e1d944d089bff7a28d55d1353ea500de6adaaaf282767fadb1f1d206a2682c7
+DIST genpatches-5.10-145.extras.tar.xz 3868 BLAKE2B 1e6d3c0402bd46656c9f524ff9b309f4d8f4ba85be0dcf210774b5975d85d2098301ff8e6b33fe419d1bc70faf0a4d1d7572fa5c70122a5508a66790a2f18c4b SHA512 d51bcafbcd6cfa70b9aefddb416020363720c152944edba3a41ae152c9b3a0ef1ca3fc70252d9a75b0b636c3480890aa8bd727e18b699d789ad5b08fd065cf7a
 DIST genpatches-5.15-63.base.tar.xz 2523256 BLAKE2B 99979433623fad89d9a237f80f126e43f8d3a013cbf0ba77c3b5a4f2d02ee5bddc8d52be4a88f758225fd0ddc6a26946f9b08011b75404830fe44132e5fa5297 SHA512 4c582e0348e8d1d8ff7747c49a09a4fedd9c6b64e7f40c13fedfef0407557aaaf65cd7fb45a41b8175c8b15fe274261960f7af74459e353329fe378bfaef0fe6
 DIST genpatches-5.15-63.extras.tar.xz 3932 BLAKE2B 372a8997239e0c1cb97db2fe02e5c3e2f8f26c29705f8210d1eb30168fa0a77209491111b64e399d4846b185ddd2141171cb13e5da5ae85e620e382262256a6c SHA512 461eb99b6e124a648bdaacb015c7b413e102cb28768bb149a154d1c4fc570ae241a73c5bc64024b385ac8eac831a6bf65e79bd93f168fb93f94b0fae133080f7
 DIST genpatches-5.18-20.base.tar.xz 776528 BLAKE2B 3d7a0cf2c6f9a5d28049c42b6e2ffccbb707232aef139c9b9aae33c37d6cef22b45261094ac5c3e23019123709c642c69d3f181683d790305f97d72d93a48177 SHA512 db5a44c919f29f0c37cd21384a5ffa6b528575f5b5dbf71800d3a6277f793ad4ee6a6d04a35c3ef5f90906133a91f4a0e23ae43e86f678a25b23bb1c77761c22
@@ -8,10 +10,16 @@ DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
 DIST genpatches-5.4-214.base.tar.xz 4943544 BLAKE2B 5b7d27e1b520cdaff98dc9fe6ddfe102a9c09fb8a5fd36a57d5f36ebbd7639ce1a59dbeb55e71ede1129a3890318b740b24bc654716f81840d6d2e6d8a95de20 SHA512 6494bb7d1b9ef0e46fa31a164b3c807338463dcd4d8108e5a0c5d944196f1b3e1df51192f733861514a302af3eefee530b1e173dec9b6ddd3bb0120e47714fbf
 DIST genpatches-5.4-214.extras.tar.xz 1812 BLAKE2B f82f9d703ed7fafa1abae01e9ab15db88b318ef84254360d105490bc727244795064fc6b21fbf771626da9adb62aba44a170165518fae58d8adfde7319e1971c SHA512 a3d8f94e4d9b7e5c29be7c1b336273f89ed38bbd4c21e6b34a51421ef71581a6e8ecc15751fe0bd7dbc1c98a754d1491304383f21925c0018b6e57891f76f303
+DIST genpatches-5.4-215.base.tar.xz 4945872 BLAKE2B 7a0e2098f86258afe07e27a460aa8602f62fe646c918668d0f1bc03307e009ea275de198445c19a5e0727c459bdd00379c1bf86eab44265eb73a072e295b82ce SHA512 dcd26f17ecbda5b2918e98f5cec369ff9e98fa323ae39f0172bf771cdb2125312d93bbc2f1d5f46cb9ba381ff9d0fd339ecc0eac8000db90c8c2b0e07016c313
+DIST genpatches-5.4-215.extras.tar.xz 1812 BLAKE2B 26646412d59a947f1ed77792269296818ed1189aad3f30748e877e947119bd87a6a916f3ecb61a6effaa7346a31e1844eba123144e5055e5567e0be315578225 SHA512 bb45c3f3c617c9446390c15296e02ff0d01d67d96ff8e941fe14a1658e2e6845f2918f2c716cf7739dc5a0bf2dcfabb19f55bb77f51ee8a7b34c5ed2b263a959
 DIST gentoo-kernel-5.10.135-1.amd64.xpak 67502330 BLAKE2B d138fd2cd1ff26e3256277b8fd2b45037983b0956947d64b112e639cb555ca1c4de055abdbf96c12d00eadc6e32a607ed1bbb45d9b3374a67385d5889b433fcf SHA512 5bfdef5d83ea108f12b21cd480f1b35bed751c56c42347e3f54a4f73bc3dac14be61c2133ce581e3cac685c9a4ff40d5f26c79a0117c4b1858df35c0cbd24816
 DIST gentoo-kernel-5.10.135-1.arm64.xpak 60985844 BLAKE2B a8e22cec67675594160e7f661a3952e59a0c53338164f70b23b9acdc8a304b1414e188fd51bb96de1972422654c966a78add201f38d3f2f3de3f2745d934ea97 SHA512 c5189162285035a036e23e5075554dd5aab1e8db9df6425f3409455cae61dd5a43a97fc3a47f287699399242ec4f841bb35b5e5f441d491f7de72e7448082326
 DIST gentoo-kernel-5.10.135-1.ppc64le.xpak 55988769 BLAKE2B f77eede27c91ce30fa556abc8a2e7af42aa984d8e5b973d0e9f3fde77c05790ce891d44d76d6e8c7fdbff608e3be80871b3afdda3b30c36abb3127fe9007c28a SHA512 05a09e9630c427b23905cff1074d4007ee0aa4391752419dba4e0f3dadc6fe913b394dcb76424e303943df54fe14a7ac8fd10d9755cf77dee64f2672c87b3322
 DIST gentoo-kernel-5.10.135-1.x86.xpak 58295706 BLAKE2B d175103a6756af83a12ed720750178075414a9c4ee899709018b3f65863cf99034f29e9d1cbb967078b207f72e45f961cfd34f35e6d4beb508fa984239975cbb SHA512 998a4a6419f05e7309070449a4182cd8652634c8d44a4e38e266c0d848f8afd4ebe115b4c2ee443882a7dadc3aaa4505199a7091fba64815c4cc55101f5f7c62
+DIST gentoo-kernel-5.10.136-1.amd64.xpak 67498296 BLAKE2B 55b5f54f3d2c9550bc845c3ac2ad8a453d7dfd1709f4be6f4e2002a2f393fa55e88eddfe03cf680cb922798e3f2be348772b132c3648f19dd7d391d2f15b862b SHA512 54f6140e7b5c41c68843c1c7b52da8a3acddd173d1dbff3e2fdd4cf28153497d8c13bd164442479f23ef57212f60a452a9832533b7cd6874766298fb6342e1f0
+DIST gentoo-kernel-5.10.136-1.arm64.xpak 60968266 BLAKE2B 8340fbbda0ab5a7c8516e19a0bfb57ec2725db2f17b1220aba126292d78820a15d2bf754a257be537ffc4ab423457914283ebfbeaf083cd7d0c1b3dcc74029ec SHA512 9b142d6d55993f61460fb0eaa2912b96121b6c810403fa7f0316d8048111350574c9855e9a7877701d77705de28b70a0cdef39420e3ab1d39518504ceae110ba
+DIST gentoo-kernel-5.10.136-1.ppc64le.xpak 56047302 BLAKE2B 42ea77f7788bbe8bca138e52d0a87213f16535baecc5a02663cc059bcd1728cccd694f40932fb2b1db60bc66fbb58870fdac8122f51e0bee6009652dbda90786 SHA512 e1ec838c90d86e977bff7180a1dcce90d6a34c4810fe84dec2c14ca0d6a6b554e2be935d30a09220104070b66950b6b08f5fe0672f14502aa5cd720863be806d
+DIST gentoo-kernel-5.10.136-1.x86.xpak 57418535 BLAKE2B 9562d6101f2508faf32dfac3f6f6b3387815660f59303b281bb1c71ae04a4266f016c08bf726df2f04d586d3b55498f8128b70428bad856e1abb1828cb945bae SHA512 f049dd9912b6d82752a4bc32d99af546c9301112bcd1524cab0d06d7989e3e9d96d4ddd4615fd7ae92b42b849e5b7e914685c3bdee5eb8664640879230980d10
 DIST gentoo-kernel-5.15.59-1.amd64.xpak 70780970 BLAKE2B 6728820f88324d719530871e41d40e80fe9f7324c6d51695687e83f9ace6f40e373f2d1e4cbbeaee671141a9036c3a27ae00d165033c21cc72d4e9154a402db5 SHA512 f6c12a43c6a192fa2b298903db53d6ae73441a659971aad990235bdb1847df79cf0cd1ca4f8ec4cf30a421b847be274c8c35dee43479dcaf4f95609473fdc108
 DIST gentoo-kernel-5.15.59-1.arm64.xpak 64214058 BLAKE2B 8c92101954e62c9ba3eddfd04726dbd03d254d6f506f5072dd1c7d725d29c498d480a1697513a3459127ab133aafc1657d1c9872beb7d5925adbb7bb5fc16ee5 SHA512 0d21c083fd3f971d2fbeae1d012dc03d4bd17bb37ab59e5bab6e87f171554e5ff19703b234c0fdfa9a9e3e98a295fe8037d49ed252a141603debd0d33149bd09
 DIST gentoo-kernel-5.15.59-1.ppc64le.xpak 58200347 BLAKE2B ee5d04f4455c9ed7449e06078f96a5372379bb11ab34b2aa3f39bb3d6941959a4ebcb99ecc3f47532944588c92c4c59078ab1a0f2a2d32b459ec6c8082546850 SHA512 63e9a38db9414b8851d274942df40ea5f35cd0200743aae906288a436cd0121e71e1a7541224a0707e261b51a1d474d5921838a134bc4597b009c7b8bf9885f3
@@ -28,13 +36,19 @@ DIST gentoo-kernel-5.4.209-1.amd64.xpak 61550465 BLAKE2B 4bbb9fc28663096cabf91f9
 DIST gentoo-kernel-5.4.209-1.arm64.xpak 57941118 BLAKE2B a0696286b4b7cf9e12408351ba008ef13f1a82e15cbd0c60a2f79e49068ab1b7c8bb9f8628e52539513e7a77972e284878a12fdc82c2b6893e39d5185e5b1980 SHA512 fe7e71321b5cb48daa388c4fa003ab302818dfda5d240a88d2d77fd77cb01ce0c6077a0c1d7cbf765758483ffce20751616dafa2b402c095741cffb86436dd41
 DIST gentoo-kernel-5.4.209-1.ppc64le.xpak 55272363 BLAKE2B bd869e67557e3326a78f019b6df449e6fa2f91d5312931ec8533061e7132f96d27200ef1e6217de5cdddeb327227a8f2ef4d7ecb92a88b495b1861eacf6ef8ea SHA512 5639a97831d86aa82dc0bfddb7fb01ee56881ead03e6509d3f6984a49183982322b3054b3ab7cee30d3222f795edbb8e79041c13c30a95bae2f148432b8fab51
 DIST gentoo-kernel-5.4.209-1.x86.xpak 53372138 BLAKE2B 848146fafb6b0405be32e59a2d7325668e4df197bd2e769ec73125ee3c66b65e10c505553dc6f77aaf20160205b4fcf1d45b666edf0eb17e593456ea60614d06 SHA512 6a80303f1ddfa53364ffa389ee9d2852001143afb6b8f3ca682df49b5cb44c3ffdbde80b63333f4eca65a391259cd1a4abfd90958675446bd0d05152727e92fd
+DIST gentoo-kernel-5.4.210-1.amd64.xpak 61539075 BLAKE2B 96bb8b29f443ea35291e19a880ed5c1a2bc9858cd083e1b5c5f4b47def976f2624e3627a31443c7d8d3e594df30c3264b0246ee20601dfd01db0c8dac170af67 SHA512 a83cc67fcdddb4f5a267815ab188bb6f49b40e3b8074c524ffaf238b7211f00cb0cca81ba33de4727f01dd218de6c6ff9fee1db0ff7abe43d06a7b6656700a73
+DIST gentoo-kernel-5.4.210-1.arm64.xpak 57952623 BLAKE2B a20d8fb5341ac1cc29bc3dadf1f801aa60e1c0c3f6dc945e7d2b353fb280a8a5f6a61d8382665a4fed9623d5f4e4c8d4bb235352e73bcd4de18a826b39820327 SHA512 39a22556df9e0ecb2d63c20737feeb208457338c0dd8b2594df6bab79630749b324c91895b52b95c86ed58c6d485a30932d4bbfc47e6b08aa0624753665797b4
+DIST gentoo-kernel-5.4.210-1.ppc64le.xpak 55243633 BLAKE2B de0876fecf91a05f9267e9e1b523ed99282ab82c04fc2f8213aebbeb175492287860c273b09593745361ecb1ffeeb68a16232f9378c3a85c1e9aa885851401ea SHA512 b81e51ed7767f42a0fb721834bff72fe0a1771b33a1bd00d5ce29fdddbead480e1150d2a99df00e40e8c7b2e2724e9ecba32c34cf90a074217a8ebc9d11e52b9
+DIST gentoo-kernel-5.4.210-1.x86.xpak 53326404 BLAKE2B 76034639128d131774462f70fd2e4db8b215929b583ffff99c5c8d9d567d1178e6350476189eca092bb685531c1c7b7a183184ea33b4948e24245bfb3f2d7000 SHA512 74bb91b738cbc51002aec54e9f59e01330a761b07de928ba93476b9908db025b4d0d5c994cab47f9c8d46ce4ebc66fbfea0b7e10d3124166297a1470ed3d70fa
 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.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-kernel-bin-5.10.135.ebuild 3175 BLAKE2B 00db42c3c9ad24c64d887e8e2faeb17c00b227fefe0a25a0fc3a247cd791430b6e27e597a6da1c6254b21c7e6f69d3e60ca09efc1a0297a2a85cab9a9a2b2a57 SHA512 60efcfc45ec0310c41aecbbae6d840cf647fd91c36c3312622e7f68e7704868bf1ebb67456f4bd6e9224e53d88289e79ee11d374cb6d481e17c4fbc431b317fe
+EBUILD gentoo-kernel-bin-5.10.136.ebuild 3181 BLAKE2B df517998c1165deede98f869bfd2851a1b797a6a5f8b70cb3c02401f703c77abfd379ed0f3f846ddec463eb0ca3bb21186b44cb9b722720b8f6c463bb0df0626 SHA512 7eba790dea41d43118ff3991b8fa2e65cc3f4c2b7075df992a1cfbcf312ba5cbdbc1fffd631851ca3698bbba565a211026c8c28e87e0fc5191f60e55fdc8ffc0
 EBUILD gentoo-kernel-bin-5.15.59.ebuild 3175 BLAKE2B 123d18c5ecc2a7f61fc523212e65288686e70f8b90f0f4a82e4293ee4125c1558e6eb2706740e8761203215871dd4974ad8122f42c851faf657792d0f77a77ef SHA512 956abe2b5146b901039e677523c787ae86824a973f78900c32f2956805c6f8d62bde05f6ddd1a77c1ec7c5c512d945267fc2123de4763489d6cf6bad60f38da2
 EBUILD gentoo-kernel-bin-5.18.16.ebuild 3167 BLAKE2B 51f48f8c0da28e2063601a0acefaf96d1b6910ac56a80cfd585f2930112c52945e17287a1025f282a35918d24f58caef907a336f532f24962367355a9c3d92bb SHA512 d114a4460c7ada94b8b06ca44b8ba09077170a13165f089bf3a55c04b83f7911d7047c593cdfd18292e91b29bfdf4fa09d534cd1364c8fd1274e77e11f551ff6
 EBUILD gentoo-kernel-bin-5.4.203.ebuild 3177 BLAKE2B b9df1ff36a996b688640bca679f8342d7cfd016e9305d8b967f5b5895b417ad0aff4e5b07023bef65c3aa7c2f895d3a21c019ddcb48a0dea5844bf16a35a9602 SHA512 46ec6d4b5f3b818ae84d60e7dc1a8abd69f5221d609c5d176a8160cd1bfbcbaf41da3b374369747c98143d5db532bb8e4969d84fa3164d7a2b1e9819b8131ddd
-EBUILD gentoo-kernel-bin-5.4.209.ebuild 3179 BLAKE2B 591bfe082bdfa4067d3bb6d34a47a2736ad5456f1abeffb90fe7358a55a57f87b5270b0da19502a0b88c4b29e075228df151f3668ba2a7546396ec68fda8cfba SHA512 d57f86923d7d3237ec6807b28c6f989b7d45250641d1308625a791dd312eb9a697b081f46acb20422758e4620f02a13c1af013e9ad6739c9aebbea3f8422168e
+EBUILD gentoo-kernel-bin-5.4.209.ebuild 3178 BLAKE2B 1a4f63a4f4007360962a4fd46a17a6fd8a6fa998ec258440a952538a5121922ae7c63ef967f1decc4dba894464b0234d64313ac620bc8d32fd7aeade536e190f SHA512 3c654d7c8b937908f5d130df2fd355f8dd4435e779078df2505c020cd094bc17f76bc21fb1ea4d2bd63c8ce5f767d45c2525992ce07a3bd72b0ee20952eb65dd
+EBUILD gentoo-kernel-bin-5.4.210.ebuild 3181 BLAKE2B 852c1e5dced74978b88730b17ec3a1bf8461ef9ab922b07b1b2e40dd1aa6cb32b9452e0fd96e63369bec9e235c3a99a7d0f2215e0e3ac331aaa161232cbd613b SHA512 e0b994133da4ad035094bde587951a4a41f161fe067b58076a759fba38fdd724ad127e25a912260b26db9fbf2bec3cef5488d87735400fae46d89cc68650a867
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.136.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.136.ebuild
new file mode 100644
index 000000000000..da84e07f808e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.136.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+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 "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.209.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.209.ebuild
index 0b7942d6ee44..e2688e863685 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.209.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.209.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.210.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.210.ebuild
new file mode 100644
index 000000000000..b6c3ce9ca64c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.210.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+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 "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv 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 5193e8140c67..d3fc63f821dd 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,5 +1,7 @@
 DIST genpatches-5.10-144.base.tar.xz 3907764 BLAKE2B 41b8ce08ca73879811e11d91f9365ddfbbc15617a4b825ba00144e71feb86e0ef24b3418b77b203a13ad6299237085a2a1c796beb6ac9aa98a5990a39fd1dd02 SHA512 1b946439d9cf6d97df1acadd7b36ef657fac40ff98b31e2237f3cc412e9efd6d4d1d409339af9d48779dbd9d88aac124f67e07afcf99e7760f93afb6d226131c
 DIST genpatches-5.10-144.extras.tar.xz 3868 BLAKE2B 0d956a61fb525b8ce3b14c215a0c0a6ffa46f21fcf87a63884d31418946a64de0c680472a62fc9bc0d83f67b49dfe88ed373e3ff2ba2f369a0909e3947b27c16 SHA512 c870f84b1a4ae7b95518d08ab46fc7e632a47884e43a9c774be34335ebf825388136ed360f5129c8c97567600e79ce2889d64d9b60a1a8bd2a5b4052e74e2973
+DIST genpatches-5.10-145.base.tar.xz 3914420 BLAKE2B 0d6f00cfba2ea5bc70bf44549e82b79d8e7a59b8e34ad7b94dc97c0ab1059ad005b15d09ab51fd9dcf65243dbf0abc0221d26ee06708adacc7dcc7aa18e7939a SHA512 4b2cc1f37d0dee2bb8181be5ea4030b3c9f2035c688cba3e5d512584486158cd7e1d944d089bff7a28d55d1353ea500de6adaaaf282767fadb1f1d206a2682c7
+DIST genpatches-5.10-145.extras.tar.xz 3868 BLAKE2B 1e6d3c0402bd46656c9f524ff9b309f4d8f4ba85be0dcf210774b5975d85d2098301ff8e6b33fe419d1bc70faf0a4d1d7572fa5c70122a5508a66790a2f18c4b SHA512 d51bcafbcd6cfa70b9aefddb416020363720c152944edba3a41ae152c9b3a0ef1ca3fc70252d9a75b0b636c3480890aa8bd727e18b699d789ad5b08fd065cf7a
 DIST genpatches-5.15-63.base.tar.xz 2523256 BLAKE2B 99979433623fad89d9a237f80f126e43f8d3a013cbf0ba77c3b5a4f2d02ee5bddc8d52be4a88f758225fd0ddc6a26946f9b08011b75404830fe44132e5fa5297 SHA512 4c582e0348e8d1d8ff7747c49a09a4fedd9c6b64e7f40c13fedfef0407557aaaf65cd7fb45a41b8175c8b15fe274261960f7af74459e353329fe378bfaef0fe6
 DIST genpatches-5.15-63.extras.tar.xz 3932 BLAKE2B 372a8997239e0c1cb97db2fe02e5c3e2f8f26c29705f8210d1eb30168fa0a77209491111b64e399d4846b185ddd2141171cb13e5da5ae85e620e382262256a6c SHA512 461eb99b6e124a648bdaacb015c7b413e102cb28768bb149a154d1c4fc570ae241a73c5bc64024b385ac8eac831a6bf65e79bd93f168fb93f94b0fae133080f7
 DIST genpatches-5.18-20.base.tar.xz 776528 BLAKE2B 3d7a0cf2c6f9a5d28049c42b6e2ffccbb707232aef139c9b9aae33c37d6cef22b45261094ac5c3e23019123709c642c69d3f181683d790305f97d72d93a48177 SHA512 db5a44c919f29f0c37cd21384a5ffa6b528575f5b5dbf71800d3a6277f793ad4ee6a6d04a35c3ef5f90906133a91f4a0e23ae43e86f678a25b23bb1c77761c22
@@ -8,6 +10,8 @@ DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
 DIST genpatches-5.4-214.base.tar.xz 4943544 BLAKE2B 5b7d27e1b520cdaff98dc9fe6ddfe102a9c09fb8a5fd36a57d5f36ebbd7639ce1a59dbeb55e71ede1129a3890318b740b24bc654716f81840d6d2e6d8a95de20 SHA512 6494bb7d1b9ef0e46fa31a164b3c807338463dcd4d8108e5a0c5d944196f1b3e1df51192f733861514a302af3eefee530b1e173dec9b6ddd3bb0120e47714fbf
 DIST genpatches-5.4-214.extras.tar.xz 1812 BLAKE2B f82f9d703ed7fafa1abae01e9ab15db88b318ef84254360d105490bc727244795064fc6b21fbf771626da9adb62aba44a170165518fae58d8adfde7319e1971c SHA512 a3d8f94e4d9b7e5c29be7c1b336273f89ed38bbd4c21e6b34a51421ef71581a6e8ecc15751fe0bd7dbc1c98a754d1491304383f21925c0018b6e57891f76f303
+DIST genpatches-5.4-215.base.tar.xz 4945872 BLAKE2B 7a0e2098f86258afe07e27a460aa8602f62fe646c918668d0f1bc03307e009ea275de198445c19a5e0727c459bdd00379c1bf86eab44265eb73a072e295b82ce SHA512 dcd26f17ecbda5b2918e98f5cec369ff9e98fa323ae39f0172bf771cdb2125312d93bbc2f1d5f46cb9ba381ff9d0fd339ecc0eac8000db90c8c2b0e07016c313
+DIST genpatches-5.4-215.extras.tar.xz 1812 BLAKE2B 26646412d59a947f1ed77792269296818ed1189aad3f30748e877e947119bd87a6a916f3ecb61a6effaa7346a31e1844eba123144e5055e5567e0be315578225 SHA512 bb45c3f3c617c9446390c15296e02ff0d01d67d96ff8e941fe14a1658e2e6845f2918f2c716cf7739dc5a0bf2dcfabb19f55bb77f51ee8a7b34c5ed2b263a959
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST gentoo-kernel-config-g2.tar.gz 4359 BLAKE2B 965392fb5b3c1290c596d3e8593cfcf54e76cedd47de335c1b9658c1b35649af18a94639bf3df84507c797e6d7ea074f7f2a2579d2d01073478b30a4f167b2aa SHA512 d1bdef2e817799fcebbcdae1f3b1666f8ca70b0d5adca74014dd665f6b02c81b839220d8fe3794ea1202e1f2589d281344699864207c98b95d23a1d1f03bd42d
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
@@ -31,8 +35,10 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-kernel-5.10.135.ebuild 3596 BLAKE2B 82ed2819c4a7fa9ec1359008005fe9522180ce5b7ee433c7e523d3849c6df4939735b01e6044cd8ac1e280216f9ab796915a63915abcff1e4b530ba2c602ee81 SHA512 a9da72910325ec2096ecf4e392c9cf8cea810e4ec3ef02621cfcdaff20ffce474f76119b95c2c7cd98295ee4c8714d37688a4c4040474873f1417feed38f1d04
+EBUILD gentoo-kernel-5.10.136.ebuild 3602 BLAKE2B 352e6cbc7b4c3dd628368308fcd01ecf133d36603a284f0c20d8e65da3e87ef29a7097a5f03c62b8d3aa6db1b5725a079b491abae7d8e0847695ec0dd0218776 SHA512 b5f058e544388a1c99337cd517479ec508f580ac5f107d8a6c39f5e3ee2c19d6953896c7fd654bf7a726a1ac974e8eb7872e4c4a1cf884277a5818cc438647c5
 EBUILD gentoo-kernel-5.15.59.ebuild 3593 BLAKE2B 0854919a718f192cc5422a4dd2d551fbb39c6ccd2b9bad56c86896c85ebded885639f80327c8f1806b5750112293848652f664acc7b0984457a378d6b4d2e0b3 SHA512 17878f909948b0de1255cecbcdbb04fd5223a212c2a6cc441e60f09bc28effda02183e2b7a8a9d597fe1bb5ad419cfe5acfc66d97503ec09f48b3eddac97d899
 EBUILD gentoo-kernel-5.18.16.ebuild 3857 BLAKE2B 92dd8fcfc85ea17399bbc5e9a15783647711d5e6ab1132100790236c6c7115377a58427cafdc404a4a03ba79189b2c9689acc7200294373976088d5d1c667c86 SHA512 ccb5878cc0881e9c3cc557c603e28633a18d7e6ecc277c68d9e94b6c1ce9f36d3e6509e45d8f3db166cf191811c4c2c542c3fab872c08a56ba24c97530604d51
 EBUILD gentoo-kernel-5.4.203.ebuild 2799 BLAKE2B 207cd00b51009fec32423c53d9c669b1b33ecdbf344ee4f963899370322bb5ecd24e8c12ee82913fa1d0459bcfa0efc85ef219a455ee0930c06e88b9d444c4a0 SHA512 e087902f31cabcedf79fbb741f323857f9627e5060441caf0700325a6d1f1a279611bef5e5fef75db8ff418ec33c3a5a2487b1f4c6eeea5d5edf4ae47f949c38
-EBUILD gentoo-kernel-5.4.209.ebuild 2801 BLAKE2B 202d1a1f4146cbb0ec32807038513359805168375c0088a4e44d4c0cf93a1e6404aeb6392e2df465f283065b20df1d47edee1334b577fac8c46f2b2e4edbf5c2 SHA512 d14e9d0b0a83901ef5fb3b3580a01f8667355bc3b67a0b8b4a5a1df928099bbc60572731aff3f1b61922117c4bd1b6b5cebcb44976fc825c3151e57d64bb1cd8
+EBUILD gentoo-kernel-5.4.209.ebuild 2800 BLAKE2B 9b3b2fc7905e8f8fcbefb63710da30a6144dafaadcc24a153ed813c2313995660db6bf1f1c3bdcaa2fb7992d0a20628bec5c32957f09ec38af152325b276d1b8 SHA512 2b9cf2fb9792099b15ca7c0da311e37d259c48e48733985158ab5726176215919a5a28c93402d4e4bdfa0cd4ee4c8903c7fafbebfd44eecd11c768de59eb4fe3
+EBUILD gentoo-kernel-5.4.210.ebuild 2803 BLAKE2B a56ad91f6edabf8645ec65291587ec72114eea6a5ee23b0f068d49aa16ad5d79faa46bba5447fb3a351826c7bb576233d7a1beece9843256ab789ef6afb696a8 SHA512 6f1a85386010497e19047e42eaa8caab33dc40089926732d5d01c826bcf91555fdb01414aaa505a1d33ca5228d903ee32c412c5b93a494815f744d68846c9ab9
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.136.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.136.ebuild
new file mode 100644
index 000000000000..8cc3f5803876
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.136.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209.ebuild
index e5b1dfba488d..015005407a4b 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.209.ebuild
@@ -40,7 +40,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.210.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.210.ebuild
new file mode 100644
index 000000000000..ffd40f039fd9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.210.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		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.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 99893e3ac347..7cf6423a1685 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -17,6 +17,8 @@ DIST kernel-x86_64-fedora.config.5.18.9-gentoo 221797 BLAKE2B 1873ffeab78c7e9a81
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.135.tar.sign 993 BLAKE2B a544cdf24ef0f1dc5ddc5622d8f00dc3af0fc38604d955c7a8b54e0c1fa7f7d60197551710cc2ab0bad69fc06d2077e5b1b796259fe29665d558b5fe656beff1 SHA512 ef565e3ae98acf58fa871e701b8a4ad2a3fd1f5aae109685cf1bd5cf0d2fca3f8361ca5d0d14613311a1bfc5069013249ece0f6eec4b88b2c4157caeca0686d6
 DIST linux-5.10.135.tar.xz 120470192 BLAKE2B 121edb3af02eb4c00195e2c4e1144636bd33fb89143fe5bf46acd924bfd00665ee17837dd2426b9a9b16ad0725f1a944350446cbd00276af30623baea84bda67 SHA512 6b945179f375db6d76e3761ddc5b64a987c27bdf9d52694ede3a158f265710fe5a8f4f4b2752641076e64a62160d501081b560675eb855305703e1fd79629d47
+DIST linux-5.10.136.tar.sign 993 BLAKE2B 2b81f6dd2520fe5b5ed78a583a8451bf5f9924466733b1920586e1250816d9d26bbd8a1bad8141bed69982e15eec2e94cf6785439b691b9afaee5e83290cd5a6 SHA512 9d46aee3bf910a95832d63422f74f15073a1c126ba5f056251e317989865dfb4ccf1fccfc8584ecc491e810f8cc021122e454a0854f0db67e3267ff845eac4c9
+DIST linux-5.10.136.tar.xz 120473116 BLAKE2B b68c62f0ba53c0cc839bb5be07f0e4f458a565c47c627b6274e50a4b95e08276a30b9bb821bd17074bdbc8ea4a6f463772922a0b6445adc3f64dd3e9858db108 SHA512 10196bfa692646cd60885524fa8dbbb0f401bef83f0bb85415d4b4838b259fb2ae446e76b7c211b46c19d9f11077ecde1d47de97be453e2f06826231764f147e
 DIST linux-5.15.59.tar.sign 991 BLAKE2B 80fe92152ba1ec23c4cd3b1c3edf6ca8b4c381dcb4f8735daaa6dc1d417137b186a08d3d1af0fe9cdf7b3a562a7cd154b8bd9c9a28fe708613f1adbe932e56dd SHA512 34b52887f668c479f530120d0cbab7f4d30bb01cb204ff158b4908db5facf75d51722d2adab66b31dd2dbecf98c707ad0736e59d63ceeb3c27a4220c7633e027
 DIST linux-5.15.59.tar.xz 126404076 BLAKE2B c601b25663f73438daa40f1a72039a4ca6a027cd356a9cca3f00341a8aab0845893d4ac848a43a34758c0959e38b11ac8857777531cf1472b18f3373ba6c426b SHA512 1dd5badf83bdde38dd43fe1f678b883200b6b4b52547281ebd0780ea1cc628138e5798e21a2eb4bd2fb71755808017fdff5c85259e2c3211da79fcc8fb87361c
 DIST linux-5.18.16.tar.sign 991 BLAKE2B 5309ae0d80fbec35f4fcdfb82e3f1fd99c96ad53b82efe4ef95f0f7ee5f04be1e97f69bfe664080ff92fe21b327dc72e723515c0fe43fa52f6a43d1894454a34 SHA512 01edeffc25b4221907f0b57aca694361ff5cf5fd6235750422b23d95241b2a1b2cd3ba0fa4b8a895e1996df49d577654a16cb302c798e8c7365ec536088f6660
@@ -25,9 +27,13 @@ DIST linux-5.4.203.tar.sign 991 BLAKE2B 4e13305b908e1e158c61ae0667186cfd42e7dac2
 DIST linux-5.4.203.tar.xz 112925472 BLAKE2B 90467bcc6ca564affaa57adb0b0e0f7358dfedcb5d53309b987b239acadf6f9b5c77c4f265c7d5f8e6a6a42e9e5ed5a16cc17baeae004e2b55470c9d786de6ae SHA512 a7c7373cf5abe9ee48920b3f314020c9c552a8cd4e2eff67a32ef2f8300a789e7a7e9b78fd1a57b8a017ccc37a2d970b4abde5a85a7bd01766fc89af64cdbb69
 DIST linux-5.4.209.tar.sign 991 BLAKE2B e750fa4ffd74c55e555201c23c961bb056171bd009131132868a1d0af0fe878bc798d805461162e40009014661ce91f9da2aee863286bd82b27b359c701e8beb SHA512 6647e67a9515f5ea7cff75fb6e451475ca8115223d73eadd6762fd1874f51834f63d3b03c24895db25da9b635abc583651962bafdec4ba0e2dcf22ccc9609bba
 DIST linux-5.4.209.tar.xz 112951528 BLAKE2B 26d3ed24f2e9686a200cad3e1f12b01e8e1344a09d445270bc2d1af39449300b30ea66d88ed1d22b39b4cafaf05d6d924f6d24fa47ceadf704a5118d5621bd2e SHA512 bc09ca7a004fd1804320d5908c85fe92e1bab820df8a61b95b06c85e41701d172333575f470ab49fd4918df282281e77cf074c2bfc44744baf6967acf32d2f58
+DIST linux-5.4.210.tar.sign 991 BLAKE2B 90ca190c2bc1e939e2aa61116f5cda649e8b16d7882aa086f63e060e6934956489fc6942baa3f6c0021e0c94aa10c9713687fc352c210d83161a9baf0bd08275 SHA512 ed9bf42de53d190c0cc8f63775584a83a7a1911a0b22611d166d616c81de88c7d70e472397bac4653bed2f971208b229ad6a9cd884fc72ddb296175dd5ec91dc
+DIST linux-5.4.210.tar.xz 112939860 BLAKE2B d02e73a6c1e597cb66d36995b7419a8bc1de876cd3c797c3cf3fec63b24b111d2b4b6b0578929ff947fd9613227ce9b804a3e0fe3e6b9d00b63bb74ae5c66bd5 SHA512 c5511c912fb67040e319b9f64927d9405d2368b85cbc139bd289a6c13eecb6ba2cb5b217ba18fab3fac8117bd9d8261b6c4333e6684970ed82a579c5f9702cd6
 EBUILD vanilla-kernel-5.10.135.ebuild 3715 BLAKE2B b05c31b018dd64fe0b94d899bc7a51a847cfc314e028fac2e7707cb910f1e208e0ba042f995ea94878a3a646ab654d422546a8f89dc78faea3d2884aaa72fafc SHA512 1427316489e333f980b3b5ec2d3eb1ebffcd13ca569146b81516a175b0681e5c5459f5cc0cbef64967d2c20765b56d9ba9c0f02374e92de1708702221d64cdf6
+EBUILD vanilla-kernel-5.10.136.ebuild 3715 BLAKE2B b05c31b018dd64fe0b94d899bc7a51a847cfc314e028fac2e7707cb910f1e208e0ba042f995ea94878a3a646ab654d422546a8f89dc78faea3d2884aaa72fafc SHA512 1427316489e333f980b3b5ec2d3eb1ebffcd13ca569146b81516a175b0681e5c5459f5cc0cbef64967d2c20765b56d9ba9c0f02374e92de1708702221d64cdf6
 EBUILD vanilla-kernel-5.15.59.ebuild 3715 BLAKE2B 0a92ef1cc83f1609e463ffd70fb223598a4d086cc996be80068e7e6fad7c5ee7c39cb8a87138721439fe9362d9001bd1f7c2c758f8579adc1e113d85acecb226 SHA512 39761d5bae8f003718e5ae9ed1b8c89b879b7214f5782c0fe81a1238d12b6944a22e9aadcdc5f2896b51a56052209677d0071c2fcbcdd2f48706c9199eec1755
 EBUILD vanilla-kernel-5.18.16.ebuild 3834 BLAKE2B f30b546364123a5adbd88cedab76649064a66e2d3ad35d79254a9696d294fad52cbfc747ce27eec877c1c14ee2a731cd6094a7aed1c5f26d1fa2b0328dee137c SHA512 6cdeb0863fde0bdfe9380decb6fbb5a75e1c87c1cba4611835fa90315b4a8cae544ae9a479a5cd59a2ea0d920d732a240b7bfea0b3ac36dc704f90fce403a754
 EBUILD vanilla-kernel-5.4.203.ebuild 3001 BLAKE2B 7b8bce74e27909fdb673ee7477f8f8b988646071f112b1efabe3bde378872b21fb55f4486ef5f595562025506f5094866218a8afbf8bb69061dd4a3c24ed50ef SHA512 513282b9578460f32122cf9835c6a032e1659b691bfc8c56edbf459de57befa801ea881a86f1fd9ecdf96b838371e5ad319c748e97ae04253eb8e47479d7e579
 EBUILD vanilla-kernel-5.4.209.ebuild 3001 BLAKE2B 7b8bce74e27909fdb673ee7477f8f8b988646071f112b1efabe3bde378872b21fb55f4486ef5f595562025506f5094866218a8afbf8bb69061dd4a3c24ed50ef SHA512 513282b9578460f32122cf9835c6a032e1659b691bfc8c56edbf459de57befa801ea881a86f1fd9ecdf96b838371e5ad319c748e97ae04253eb8e47479d7e579
+EBUILD vanilla-kernel-5.4.210.ebuild 3001 BLAKE2B 7b8bce74e27909fdb673ee7477f8f8b988646071f112b1efabe3bde378872b21fb55f4486ef5f595562025506f5094866218a8afbf8bb69061dd4a3c24ed50ef SHA512 513282b9578460f32122cf9835c6a032e1659b691bfc8c56edbf459de57befa801ea881a86f1fd9ecdf96b838371e5ad319c748e97ae04253eb8e47479d7e579
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.136.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.136.ebuild
new file mode 100644
index 000000000000..718e3ea82627
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.136.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.210.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.210.ebuild
new file mode 100644
index 000000000000..bffac7964798
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.210.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="debug"
+
+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
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		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.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 64d34dd87083..511d6b1d6a8d 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index ce44fc73a72c..44fb38cdc880 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,6 +1,8 @@
 EBUILD dist-kernel-5.10.135.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
+EBUILD dist-kernel-5.10.136.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.15.59.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.18.16.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.4.203.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
-EBUILD dist-kernel-5.4.209.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
+EBUILD dist-kernel-5.4.209.ebuild 391 BLAKE2B ecf84a9416f5ec690168b380b800170eea238976209f577102f47df42e0774c28e1091959deac0baf3bd759f913a24e5543d561d10866194322f1e8549c11cfc SHA512 181c2ad4bef927fae1ca9f34b2b2610dc43eea041ce0916b9ec10ecd2bf8232467b9e3ad498a78e510d58d7458d870334c374b3ec694b9c5c3bdf4623b6c40ca
+EBUILD dist-kernel-5.4.210.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.10.136.ebuild b/virtual/dist-kernel/dist-kernel-5.10.136.ebuild
new file mode 100644
index 000000000000..5594b4186dc8
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.136.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.209.ebuild b/virtual/dist-kernel/dist-kernel-5.4.209.ebuild
index 2e0a7cc6b4b7..d742f50c782d 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.209.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.209.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.4.210.ebuild b/virtual/dist-kernel/dist-kernel-5.4.210.ebuild
new file mode 100644
index 000000000000..2e0a7cc6b4b7
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.210.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 5968a67130c1..bde822d9a546 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,4 +1,4 @@
 EBUILD jdk-1.8.0-r6.ebuild 481 BLAKE2B 4dceecb033e5ac793574de2b244c3562690d17b8c8fbdca133d70810904a715d61f9ac440ce023011c6c4057a95cad88facaccaf98f3e0c45f56e31672afd3e3 SHA512 5e0fa11e168efa9cdf3d9ccdd76b2e3da8b240a419505e93eb28d6d83cd39e0629855674ab5a737c19d1157d352234a0b5fa7a852c75ded74848b8eafbe057bd
-EBUILD jdk-11-r2.ebuild 369 BLAKE2B ae8ce5c108d0ba8c5ce4583801c73ab10b70f923d014cd629775e1e759198d169da155b8410737a8bcf87b2b212c5ed2a7f265750c92c7d6356d4a9124ac4083 SHA512 b18f5903f48837a0fe3ff35430337071b4880d3e5b33921f91a696972c306031ab86368b9555129ef943cc2602c9b6a707701c3dfb69ef2c4b5f97560347e009
-EBUILD jdk-17.ebuild 369 BLAKE2B fa17b3ee550110c9a59c8621c369312e5df18a751a5cd31a2f4d939b5133ed7a402cd7e389cff8e01498a16e1798f713b87e7943b6c2aed8e9469eb8346adb87 SHA512 30136165607b6256d8d14f578b1e16658f3fe9cd03846d8e23fef5787bae0905cdea8eb473375336d9b7cc39d90c1322d9d180c0f7911f27206ac8c7983488bf
+EBUILD jdk-11-r2.ebuild 376 BLAKE2B e505054f44e217624f82b87f997d310cc0b0087bc99a3b09fb9283b3915f1ba04917b595163954093fdea4457ab91a1086dedc532be61ba566b632de19c61398 SHA512 f9e10db3659f5fe25406d91f4a9852ba1b704eaf03e864c465412b9fe8f420cfcec4ea1268ff9e1a05da62fd9e83a96f44a3d068601a5536aa38c921c06eb488
+EBUILD jdk-17.ebuild 376 BLAKE2B c39d0ca4abb7a041dbcb20ba3a612982d43b3c18072c833939a6edfe05343f2d60933957500e770665080d2d90bc71af8b3add54d452cef58c9bdd5cb2792166 SHA512 241e168b16b95ebf7e2f7677762042d20ffe81f8cc395036010de639cedadb2447790b90aeff6c0940611cac3ae799559af3862d02e51e200103bfeb6cad766c
 MISC metadata.xml 368 BLAKE2B 6298bd4e4c427585545c1ea59e3fd7ddbdbf16e1faf4c441a60d55b31f7512c60b68c1069b357c8e1f330ae2119d717a8d3fc2381f5f2d431a2d1309fde5dd79 SHA512 61caf57982be84ef09b17d7bac1237973a450d8778fc5f93e126e9dd64ecc2e6a936db0609a5072a070d7815903197ec534602ed941925ad5890111862d9ccee
diff --git a/virtual/jdk/jdk-11-r2.ebuild b/virtual/jdk/jdk-11-r2.ebuild
index 7032cca35142..25d3c5f9211a 100644
--- a/virtual/jdk/jdk-11-r2.ebuild
+++ b/virtual/jdk/jdk-11-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 IUSE="headless-awt"
 
 RDEPEND="|| (
diff --git a/virtual/jdk/jdk-17.ebuild b/virtual/jdk/jdk-17.ebuild
index 4c3f45fc8d30..d221cfbe93df 100644
--- a/virtual/jdk/jdk-17.ebuild
+++ b/virtual/jdk/jdk-17.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 IUSE="headless-awt"
 
 RDEPEND="|| (
diff --git a/virtual/jre/Manifest b/virtual/jre/Manifest
index e405401ac2a0..59bf5fcef06f 100644
--- a/virtual/jre/Manifest
+++ b/virtual/jre/Manifest
@@ -1,4 +1,4 @@
 EBUILD jre-1.8.0-r3.ebuild 360 BLAKE2B 8c604b057765e57f590bf68f5b0140bbc297ddb72620ae6a5dc2dd4ad76509e9de4ff7f7e9bf7dd9bb6ac13e044f0619830b6d9d333759a50f788606d0a8e1a2 SHA512 e06698ef632b0216dfde10e01e16edb67de267fe8b6d1957be38121e5296e6e56f67d80c3c91b850ef564565a05ae13872ea86880fb36d072e913dfe1931bc46
-EBUILD jre-11-r2.ebuild 310 BLAKE2B 050d81ea818e1e34575222f1b9f6ec9213357a1039ec17a6e7fc7b78b561a1f9c4e78a04e49c43263b2631ec8400e3156544d1289683272cecfc18b9cfc600b2 SHA512 7fd891f91d21453e226c8b3b7a98dc1f56e00cd3ec26bb39265ca52576fa307f3b46d94d77f5dbf77be314dce9a15339bc53986722d196388b5044f1a289b640
-EBUILD jre-17.ebuild 310 BLAKE2B 7436119afab8260c55d732ec29f821446bc5292a0adb5b4b07256d74ceb87dc571dec7f753b2c48fac3a4396512f17a190799bcd343dfb5eae61460d73cf919c SHA512 b8d6aeed9c4d3c5ebb45f4bb1897e6704b7bddda7c9b5a479132540795578909903b986fefb7a7d57b832e4c6b9f4ae84a7fd692078dc8297e9b11b918733f25
+EBUILD jre-11-r2.ebuild 317 BLAKE2B cef019aefc39591aed051a6b395ed197dc6ae90aa4ddfbad92f788582eafa4be54c4b415a002c1dd88d15600ebd45f743db73adfdeb85424969f72c75514cd5b SHA512 6f1451fde47e39dc5a722f809921bc584141e94888af130d7e5b3967233184383c91a1205e0e64fa28b59790a18575e5a0218a67a3b229590206522e5b0636ef
+EBUILD jre-17.ebuild 317 BLAKE2B dfa18874e165bbafe94aee3b7f3bb7941598677420a6683cecd28dc961fe01857caf378f04da070a3be2f57a1494fc38cc4ca506ebdf7568170f0311ae736568 SHA512 cd284d9dedde722cd2d95360b282de8fa36c878e825e74b1f891d1bdcbb536f270228f82148638f99e22240800fd08861ef024fd90533bde0ab90fe2ebed4c59
 MISC metadata.xml 261 BLAKE2B 8f415bc9d8eed52fb60eea18c29354c635602c7f571670dfe3adf98c7bc0d0d4daf923d2a2b45a825caded195310ab81240f645b006f0cb820681eb1835f4325 SHA512 1842d84b92b5dacd5280960a97380be4625bc7e210aaf9ae62845d7e0c09bdad394151e2edd0fd4dc987d3d16460c67e55512d78de36165fe3e6ad87d029a23b
diff --git a/virtual/jre/jre-11-r2.ebuild b/virtual/jre/jre-11-r2.ebuild
index 4715fadc1b67..764142bcff29 100644
--- a/virtual/jre/jre-11-r2.ebuild
+++ b/virtual/jre/jre-11-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 RDEPEND="|| (
 		virtual/jdk:${SLOT}
diff --git a/virtual/jre/jre-17.ebuild b/virtual/jre/jre-17.ebuild
index f42ded3a228c..b4948459fd41 100644
--- a/virtual/jre/jre-17.ebuild
+++ b/virtual/jre/jre-17.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 RDEPEND="|| (
 		virtual/jdk:${SLOT}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index e8f9b927e9aa..8598b05b7564 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 0de5e27e0ec7..53fa755f1292 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-snapshot_5.4.2753.19-1_amd64.deb 97606564 BLAKE2B 4196bdf0151dd1f1f108a01b65ebde08f2a5622e30da88fc635c9e43535d7a983f77953911e214da573589430591b401e5981f7c62033b35f3719fb0f2301769 SHA512 1e4fe56d4c0b92a39382bf5e87d4b7efb20ef3f585ad93535e5d269a935420b09752e453ab650ba6aa88fdf6f6900d232ae1b1390ab7630fcb8cff35a21c6ed9
-DIST vivaldi-snapshot_5.4.2753.19-1_arm64.deb 87860620 BLAKE2B 80d0ff6f3e84ecf18c54c62ba6249650334e9f0cc965599a32e45858c51db1c3b7e4eef57e406acbb55a9e6b6dc14d16f7da1b3a186928b5c2b925e7d6e37437 SHA512 e9b12fa0c96a9af93d06c04b60d9aa39debdc47bc7e3f31bcbb6943bd7437ce0ee3161f372ffd66058bfa5a8e15a7c7d308b0962049c67e734dedbfac732f405
-DIST vivaldi-snapshot_5.4.2753.19-1_armhf.deb 88363304 BLAKE2B 43777e10dbf7cdeb85fc9e90afe8e5a098641aa94114e2f7810f8d7b228a877cb1521032bdd953a73895b7048df148d7494002bc6aed36a71f9a0b6209fee825 SHA512 5849b9b3234f4b72ad8c29fa7ba497f692a014bd4497093f1b13134d86e66498ca17f1034836102bd1006c8b186b60ada2a667d087e369f72189e2e9ac7435df
 DIST vivaldi-snapshot_5.4.2753.21-1_amd64.deb 97567004 BLAKE2B 7853e76437f4cd1d9d5dd23760fdb51975c7238c4229bbfed81293e63a3e26db96cb8e3c4e18ae60aa978629cee5ee2a16d0fe2fbf37cc102442f232ab75f757 SHA512 2c5dcf3892b9fa3d75b64e3a55a25b79f6846c0ba0de2cdf2a587f2748e51e3c0f94696ce6ef32445c0c43cea155f0dfbb3be9f928332f86beb1aa6acb1a1f83
 DIST vivaldi-snapshot_5.4.2753.21-1_arm64.deb 87882492 BLAKE2B dbe55b70b3744321fad6c882d7f3c20e2de7e821a4e61c2b3a3f2ed43fe0e6f1ed7eb71863217398725fec0ea15bb1c7de251f01be6aedf0602717e09b23006e SHA512 17db095f4ec2d936dd41d0369223f185877ba8dc372f922e6d7eba3d4c320325b4496ebb887be787d827bd05ed2fa92cd8cb1e29da6ccfdd91d1e3f7f9a38a6f
 DIST vivaldi-snapshot_5.4.2753.21-1_armhf.deb 88377804 BLAKE2B ffc6c58e2e69699b5cd45f8d1a910e9907fae7bdcd58ec5b7fc038f642c4e89317e41f14931c624bfb39307e5750862ce7f81c0689cdecc18c86c8eb0254edf3 SHA512 59f729843d11c66163ed9a21d6aac2895c391b7da0a58d23caa5e5dcdfc1348a8f785bb559facb3bcf7a5ec9cedfea59a59067f80e24e4adaafe992e8b752279
-EBUILD vivaldi-snapshot-5.4.2753.19.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
+DIST vivaldi-snapshot_5.4.2753.27-1_amd64.deb 97597432 BLAKE2B afcac0f2548f91f8de7aa50f79f85d6df878ee499a14e6cf44e76d080d42338a62c14c0935c84b9289ca1faebf219dfc1fa717f2fa56f709754d6bcec85648b9 SHA512 62bcf35fd37e879924a9ffc150a34bec1b9329212b20cfedbf9bac6773db5b59457f4a6bc69fd4c51ff32672d9e87a30c8166bb1b11a34d519bfda84283b3807
+DIST vivaldi-snapshot_5.4.2753.27-1_arm64.deb 87874496 BLAKE2B 3728370232735c1d8b22e2bb2f82611ba77b9b60effaae8c8759af5a24eea0562633f300a0c24fcd44586bf73c712e2271edcbc3cee0f5eb51501a19d0421a7f SHA512 59cb375fc967dd554b3e483a3767e64cef6c8802f073dcad9bf6333f1311430ff7a1a144fa4aeb955de5b73fc3783094dc3f6aa3f5ae1dc2b57874c503dcface
+DIST vivaldi-snapshot_5.4.2753.27-1_armhf.deb 88397740 BLAKE2B 82522a95b2b483d31b18a223b140ea8ac905599e6d8a7ae8803be700ccb1a8d173f0375b1dfabb9c57dc4cfd4dac118f7771e6cdf4790eadf164d3e8e6e59d92 SHA512 0cbecda93ddc87c89e5ae82c85f72678605c3d8f09b5df7b227f72f2273d488100493d6e7d77e8302b9c7bf910f3d89b8b52fa0d835ba72c4b190c6de7976b8e
 EBUILD vivaldi-snapshot-5.4.2753.21.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
+EBUILD vivaldi-snapshot-5.4.2753.27.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2753.19.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2753.27.ebuild
index cc815568ad94..cc815568ad94 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2753.19.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2753.27.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index f479279a3bef..fcb17b18b97d 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,8 +1,9 @@
 DIST vivaldi-stable_5.3.2679.70-1_amd64.deb 89908668 BLAKE2B e03200cc5d6b4fffb760ff2192f545f54d99d40cbc799ce3b57e1e2766524f32e4b282dde5b5dc9c06d5582d03d80350c734944f36f7b61614a7c8cc7de98d10 SHA512 6cdfc8f9d00eb07b68a0d700f57b5f8135b3c0c166c97e8d5d100ca3e0c00965a5ea8bcf0e5e5d206f12fd4bb7bfcd867539f6a8c82fe024aadf63776ed481e0
 DIST vivaldi-stable_5.3.2679.70-1_arm64.deb 81633136 BLAKE2B 6cfad0ec2f47a0228b6e5cacd689540cf2a26606433906ab79f298897fcea870b579459dfc84fed5c6933ea53d70de558fec4a8730d67d69c7b7293c5ec7c4ca SHA512 3fc2570c32189088d24d1e9e9d3ad2b16daec281a85de1bffc0161e4320e846f896cfc08c39ba4b7c42505d79f7f5d2b15c5e03e62a91e333c891bf0f090488e
 DIST vivaldi-stable_5.3.2679.70-1_armhf.deb 81281828 BLAKE2B ac4ae8ca2ed316dcb4d41ac5448c3adbc2ad9763b7ce63d2e11244e5fc8e3629e0a3a5616730b9d039c23b04d6a201b69e6de5b754298d2afee5cd1589cd9aa9 SHA512 5c648cf881a59973cd95be789b2cd112f15518f41577bed4c934f6be84f8b540a26c27896decf855c0f3a438d5c78232ae1ef93835ef80ddc1d413759abde0a4
-DIST vivaldi-stable_5.3.2679.73-1_arm64.deb 81662184 BLAKE2B 521a72a52cd2bf90f63f60b5a2bf1e08baa9e7662041438da812612c20aaeeba9488504882d7c9fe5e82960e89377a13d9c3e7be09c1a6fbb9f18715f0e9a42a SHA512 42105dfac48ce9177937d85f3ebd8fee146a333e528baab4f413f73db60e93cedcc57c0fb888eb00046a25892fe6a2193adde9d3affab3012cfd159ca7c4cd61
-DIST vivaldi-stable_5.3.2679.73-1_armhf.deb 81299184 BLAKE2B e432b093c0d9bcedd2eb8dce6495a7bb59c0cf8f9ea6a537c142df762fa0a9483c7bf1f81083ddfffcdf0088197edfe6a2ddfd6f35c1d49df5b749470191b4a6 SHA512 f89a30f1c6ca35927989d2c08e9d4a1e61a4dc717cccd590bf05421fde795a743ab4f96de1c5b4c2e91c1ca3de9270fd6cd94d9a2e211f24d34050242f43e341
+DIST vivaldi-stable_5.4.2753.28-1_amd64.deb 97607844 BLAKE2B 98b4d55931f9809c20dcebb162d30c83375af725fc11ca72ebcf61c2a3ff91de563bfe127ab507224255f5c6865df76d3ea9b141827981e5a78cb42c1cbdbc5b SHA512 88b43a8378986b608ae7bd840b55f5c98d83a4614a5fda7ee4ceb03923511edf7128dfbe138a320ecc27dd047db21f5e31f41f42e298a5ede93b564f7efec800
+DIST vivaldi-stable_5.4.2753.28-1_arm64.deb 87875228 BLAKE2B 88c43b2f07f81bc809bb5a3a7e3bd4cc4fb2b85e86f8d17518cba1e9769ce550bd7c08e74b1f9c11cbc003674a23b359bd4b70ecc67ed2eb70b18a7f50ce86bb SHA512 2bef4d5fa85ce14b068dc4528984321dc1d21f05fad266d6247a9afaecae9e3f740ff9a0acad633d9f189b2c979f6c3be7120c981b528ee325fc04eb4d76ea70
+DIST vivaldi-stable_5.4.2753.28-1_armhf.deb 88386840 BLAKE2B 1f11e37da7cb0d940d70d652109a6aa71952e00669e3a7416e1c3a2c1406109948273f6eed56eb5e2cb7e16417746a08b4ad5584a45b94d7527308ae155a97a2 SHA512 596f3d3b6deb2aef8b95892b510c0486ddb26f1babf581f5fc2701872108804efeede4107b85a399c0ddbd1f338bc58492f3458028a4dc573b74fc1df8ad34ef
 EBUILD vivaldi-5.3.2679.70.ebuild 3659 BLAKE2B 768633f5a10cf3f65d1419e0bf726d4f74eea7ab20e6e8c0c63be13a4b2bc8df575900e7e833cf591d27779f32981a714ae2b33ed5511225e8dc385ea297629e SHA512 6ae743d7f41787ae3962b9c0821face2373a370687b536ac67996ece63f6a6ad528d406c3375d2406eb2daf4ccb7ea8de96a7b06ed73ee881596c239a222e1fe
-EBUILD vivaldi-5.3.2679.73.ebuild 3653 BLAKE2B 46a55336c514d7c68ea1991588018b6d74a0cd54ba0a53ea50284b761ecb83d3526de47ac7464f6b381e7e818ad530ee996cab5f5b55dad260ddb4d80e9420e3 SHA512 d90e20fe076c5dbf700581e5ca7be7f3e5d57d56d1af06bd2270373649db5f3b98bd073e93991cf503353f0699f29147da1304a2c185c0a8aa2432a917728d9d
+EBUILD vivaldi-5.4.2753.28.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi/vivaldi-5.3.2679.73.ebuild b/www-client/vivaldi/vivaldi-5.4.2753.28.ebuild
index afa3518fdc1e..cc815568ad94 100644
--- a/www-client/vivaldi/vivaldi-5.3.2679.73.ebuild
+++ b/www-client/vivaldi/vivaldi-5.4.2753.28.ebuild
@@ -97,7 +97,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* ~arm ~arm64"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
author	V3n3RiX <venerix@koprulu.sector>	2022-08-12 02:20:53 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-12 02:20:53 +0100
commit	671bddebe185c0542619bff3199935bfc8833727 (patch)
tree	a45296237166c760a0cda0a72836dd451c57a8fb
parent	f4ab034d81402342178d7cca4689e01193cd38ca (diff)