gentoo resync : 17.07.2021

29 files changed, 30 insertions, 265 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 3399c17c566a..ff1c16a87bcc 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 696eb45743fc..3e26d7f873b6 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,25 +1,13 @@
-EBUILD dist-kernel-5.10.38.ebuild 383 BLAKE2B 80eec9edaf8e2502e3d24e3c4c48b98ef709ff2236aab76f8a1885f3423822c2f323cdb401e881f49f19c2a10024d69e97080e4ea265e62b7538c6500871d2af SHA512 232d47e93114609f82b9fb34db5cdf25f4519d5ae9942cebbf6018b554fc4f9a0486b37b8b83646b504fc8a75856af061c1c7d9516f91556ef01adb11b775322
-EBUILD dist-kernel-5.10.43.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.10.44.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.10.45.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.10.46.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.10.47.ebuild 386 BLAKE2B 11a2689e371fbe27889a66cd11c9bf8a830cf158d323c2f0f7cd189f842acb7d0219fdb13ffa8d303ff0ec9aebf8b4e838424d34e1ca9a885efea01ee2480c2a SHA512 728e27fec63978d59d57adcccd3b8fa2fd36c15a786eefcab7f2a9e8006127adbd6fad7855b7a8a7007ebecc1f01fec1ada67614b36e715740855119419ddb73
+EBUILD dist-kernel-5.10.47.ebuild 383 BLAKE2B 80eec9edaf8e2502e3d24e3c4c48b98ef709ff2236aab76f8a1885f3423822c2f323cdb401e881f49f19c2a10024d69e97080e4ea265e62b7538c6500871d2af SHA512 232d47e93114609f82b9fb34db5cdf25f4519d5ae9942cebbf6018b554fc4f9a0486b37b8b83646b504fc8a75856af061c1c7d9516f91556ef01adb11b775322
 EBUILD dist-kernel-5.10.48.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.10.49.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.10.50.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.11.22.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.12.10.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.12.11.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.12.12.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.12.13.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.12.14.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.12.15.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.12.16.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.4.120.ebuild 378 BLAKE2B 425766351233e0cc1717be1ad4fd1e200bc799f0aba6693f174bc043be6a179616a25797d8411897c3fe6dcac975f3d7917d33171d3e0cfea8e842586ff68808 SHA512 763d2b93d60d712cdca6dfb85666b79d3e678a8ea3969609c8edd8f96f05d372cb768718893cbf7dc85e0a4615b1d3842fc1423d287e07c598d30f0bd321cf29
-EBUILD dist-kernel-5.4.125.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
-EBUILD dist-kernel-5.4.126.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
-EBUILD dist-kernel-5.4.127.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
-EBUILD dist-kernel-5.4.128.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
-EBUILD dist-kernel-5.4.129.ebuild 381 BLAKE2B 06adfc11a548a12345ed06ea95e1f0838a10a4ec5e311afa4ebdf9eaa2e816a83e8a34804b4d4838a14d2ae82e50213feff3819306c2f29067b478bdcb2f9252 SHA512 bc8a6969e370ed09d999dcc6dd975f69e4dab85d4511694d95bbd97a0aa0059fb1a5499f3b53d7970b7f87ef325b20d80eb1cf0b204f58f490b628e04045891e
+EBUILD dist-kernel-5.12.17.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.4.129.ebuild 378 BLAKE2B 425766351233e0cc1717be1ad4fd1e200bc799f0aba6693f174bc043be6a179616a25797d8411897c3fe6dcac975f3d7917d33171d3e0cfea8e842586ff68808 SHA512 763d2b93d60d712cdca6dfb85666b79d3e678a8ea3969609c8edd8f96f05d372cb768718893cbf7dc85e0a4615b1d3842fc1423d287e07c598d30f0bd321cf29
 EBUILD dist-kernel-5.4.130.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.131.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
+EBUILD dist-kernel-5.4.132.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 MISC metadata.xml 290 BLAKE2B bcb7e629ba04928387a13bfb6b95fc2acce4d8b2bdf2669ea1c6299a954c8e94b0e3b4d65cd4b424dd8da2e33405bfd0cac3a12ff2603faad3f69b516d0f0aa4 SHA512 6b8c9a6b6055c46b0cce5bbd155d53a0dd1115edaad016bade7fc1cbe3ee4a9c2097fa3392f9df6830546b36c65cdf99cf2ffda40a313117ab5f32249677c753
diff --git a/virtual/dist-kernel/dist-kernel-5.10.38.ebuild b/virtual/dist-kernel/dist-kernel-5.10.38.ebuild
deleted file mode 100644
index 340ca7eb117e..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.38.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 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 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.10.45.ebuild b/virtual/dist-kernel/dist-kernel-5.10.45.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.45.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 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 ~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.10.46.ebuild b/virtual/dist-kernel/dist-kernel-5.10.46.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.46.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 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 ~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.10.47.ebuild b/virtual/dist-kernel/dist-kernel-5.10.47.ebuild
index 00a3441127f5..340ca7eb117e 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.47.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.47.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.10.43.ebuild b/virtual/dist-kernel/dist-kernel-5.10.50.ebuild
index 3df38272de32..3df38272de32 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.43.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.50.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.12.10.ebuild b/virtual/dist-kernel/dist-kernel-5.12.10.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.10.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 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 ~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.12.11.ebuild b/virtual/dist-kernel/dist-kernel-5.12.11.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.11.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 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 ~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.12.12.ebuild b/virtual/dist-kernel/dist-kernel-5.12.12.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.12.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 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 ~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.12.13.ebuild b/virtual/dist-kernel/dist-kernel-5.12.13.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.13.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 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 ~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.12.14.ebuild b/virtual/dist-kernel/dist-kernel-5.12.14.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.14.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 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 ~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.10.44.ebuild b/virtual/dist-kernel/dist-kernel-5.12.17.ebuild
index 3df38272de32..3df38272de32 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.44.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.12.17.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.4.120.ebuild b/virtual/dist-kernel/dist-kernel-5.4.120.ebuild
deleted file mode 100644
index 98a5bc7d0b98..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.120.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 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 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.126.ebuild b/virtual/dist-kernel/dist-kernel-5.4.126.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.126.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 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 ~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.127.ebuild b/virtual/dist-kernel/dist-kernel-5.4.127.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.127.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 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 ~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.128.ebuild b/virtual/dist-kernel/dist-kernel-5.4.128.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.128.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021 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 ~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.129.ebuild b/virtual/dist-kernel/dist-kernel-5.4.129.ebuild
index cffc4720f148..98a5bc7d0b98 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.129.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.129.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.4.125.ebuild b/virtual/dist-kernel/dist-kernel-5.4.132.ebuild
index 11d6573ded7c..11d6573ded7c 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.125.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.132.ebuild
diff --git a/virtual/fam/Manifest b/virtual/fam/Manifest
index 919b47fed888..0f4913ec7412 100644
--- a/virtual/fam/Manifest
+++ b/virtual/fam/Manifest
@@ -1,2 +1,2 @@
-EBUILD fam-0-r1.ebuild 478 BLAKE2B d0c4f234effc20e84e5760a28f3b8f48b4bf5a49b07ec17e5ad220068383c3566c92cca51a1b0369f7791cc192116914c02cf7bc9711ec55955b00ac0f600a3b SHA512 b89284d44a1df30ed5df59599cf78fccedecc49461b0265748595e3e1deade16abe1c4867d378d63acdb69046248ba292b095d185aba74ff42e520639bec9168
+EBUILD fam-0-r1.ebuild 485 BLAKE2B c083f6fb60a0a172e95bb6241c7e6b9dfcd38928c25c50f1083984e3082575991a08866c0c210a058327499ab2d4474799ed545919d04a45a5f9c46e47e546a4 SHA512 6cba11578629165f0460c1ae0703dcad241e21e6d386f59b4d7fe80fabbf2fe46b0d8a65c82d748c7c434e4ea318a66ce94a78380961134464c5796d3564cd2b
 MISC metadata.xml 252 BLAKE2B 269351d5fec6de1f8236181ef68d9a75ee1f8dca300a841e4e710502a04cc5383cd310672f7b629185647e441fb4e0b49edce1a39f3c2b2607c5e9d4897fdcb0 SHA512 5829caf1025801115ab3af6b5036f61fbdacf2d84cac533fc0d61e348d8387d19796469c213422f98fd61587ecb483b00b6993ae30434fa5e89e5361aeadc6bf
diff --git a/virtual/fam/fam-0-r1.ebuild b/virtual/fam/fam-0-r1.ebuild
index b3b834c9ea12..42f95524f48d 100644
--- a/virtual/fam/fam-0-r1.ebuild
+++ b/virtual/fam/fam-0-r1.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="A virtual package to choose between gamin and fam"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/gsasl/Manifest b/virtual/gsasl/Manifest
index 1ef330636086..a0e8631e9710 100644
--- a/virtual/gsasl/Manifest
+++ b/virtual/gsasl/Manifest
@@ -1,2 +1,2 @@
-EBUILD gsasl-2.ebuild 339 BLAKE2B 225cc3f4b86e59bc40c362cf54826a739c85301047f7b7d05b54ee6da737831d38be8e763e96dcf4252675d12c377afa8aaad2a664c8aa02f845bd728105c0a3 SHA512 01d789107c134b43399dcbffbaa026f7ee1502fb554c18a71e67e0a7189501f3fff77f173ae95aea9315fb1ae482e1cc99ddeb6852c476f6bef963de69809b51
+EBUILD gsasl-2.ebuild 346 BLAKE2B cd8559ae2c49b6382fc9325b1ce2a99b45cc71de95d4af8fd01428af9834482fe685409f9a9ee8ce5d3e0b10a2e8b17ef3b189041f0e5da981e149e735c26631 SHA512 323b7c61dbfd53891c1671ad3491cbe61bc8ed08a409ad4d0a05aacc8cc00149f26d1867740837d15303f68bbe1bebd1eaa99446bfe6bad5cfe50455b1e68815
 MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/virtual/gsasl/gsasl-2.ebuild b/virtual/gsasl/gsasl-2.ebuild
index 768f5a318046..a3693b92cfff 100644
--- a/virtual/gsasl/gsasl-2.ebuild
+++ b/virtual/gsasl/gsasl-2.ebuild
@@ -6,6 +6,6 @@ EAPI=7
 DESCRIPTION="Virtual for the GNU SASL library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="|| ( net-libs/libgsasl net-misc/gsasl )"
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 7b500dd9b40d..b92d566685fd 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,3 +1,3 @@
-EBUILD jdk-1.8.0-r5.ebuild 401 BLAKE2B ff964f93a5917410534587538f59c0dec6861e044c8b159d0ae6b0164cb5bcdbdb3e35128dfbb523d13c7fef66614754d557f0bd866b900c406bf5830ea72bc8 SHA512 55fcfacd3ddc255cc936c2a4c761ff7962acebc3c1197076851b90de29e421a8119a7467a9228d7bbd142a6124532d5a2325c6285dac20ef1fe19ae372492cda
-EBUILD jdk-11-r1.ebuild 320 BLAKE2B afe18794e5b998b9c09ba77b554a160c0ee4041f9ee87cbc32d17242c03bed968fae47413760da5474d204f974365f95a8ee4d3c12bfa2413cc4f3c2d22bae7a SHA512 e6093468ac7127de8bafb4b4f5309dee990b1916bc6e835d4eafb9c9c9b0686fd6805dd02dbb260262eb64147772900321165793da858c50e66e49df86728444
-MISC metadata.xml 260 BLAKE2B b37eb6d2d2182a4b64e7c3a9881a08a7072533de1f0920927c3c197f53db2a0ad57a44bdf47cf75cf08a93d6c55b2f6e0694227bcf07a606e337345131719cee SHA512 c4b63e127973fa92d06e9e1efb5d42571a9963a23c60e50039d8a4fc31b2ddfeac407deae9e03c2c1636957b3b3c53ba3944c03978958bada06a7996337fbb7c
+EBUILD jdk-1.8.0-r6.ebuild 481 BLAKE2B 4dceecb033e5ac793574de2b244c3562690d17b8c8fbdca133d70810904a715d61f9ac440ce023011c6c4057a95cad88facaccaf98f3e0c45f56e31672afd3e3 SHA512 5e0fa11e168efa9cdf3d9ccdd76b2e3da8b240a419505e93eb28d6d83cd39e0629855674ab5a737c19d1157d352234a0b5fa7a852c75ded74848b8eafbe057bd
+EBUILD jdk-11-r2.ebuild 368 BLAKE2B cee739058d7440f90d7df0dcd51852d760f05f7bf7a358ea3b46d12563bf946e0379ba78d87e358816bcd133c089c6e684d8377aafee24bbb37b3f01dfbeb10b SHA512 c98d5bf5af5ad469dcdc00da7aa89e8888f9bed61a1578a635ee3aead34f2374e1bd0a23e1b82b8ad6f666783c292930b49c0fe43181e1b2113740362f8ecee4
+MISC metadata.xml 367 BLAKE2B 80910cdb666e867df5c978ec9023f5efeff97090011483ba43a203c17d1d7448d2c1badf16e2285ed95d9b04383dbea73bc82ea0e1d9136cbbdea9580f2cf6e1 SHA512 35453938f1c92944314b416ad3a24bc7015b3146ea5fb650d82ab05dc6b161982e81f4a5ca432773227de2896c6dcdc9594bca8d85f626d9d195bdf9c2818974
diff --git a/virtual/jdk/jdk-1.8.0-r5.ebuild b/virtual/jdk/jdk-1.8.0-r6.ebuild
index f20b926921f3..62bdccc8153a 100644
--- a/virtual/jdk/jdk-1.8.0-r5.ebuild
+++ b/virtual/jdk/jdk-1.8.0-r6.ebuild
@@ -6,10 +6,11 @@ EAPI=7
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="1.8"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="headless-awt"
 
 RDEPEND="|| (
-		dev-java/openjdk-bin:8
-		dev-java/openjdk:8
-		dev-java/icedtea-bin:8
-		dev-java/icedtea:8
+		dev-java/openjdk-bin:8[headless-awt=]
+		dev-java/openjdk:8[headless-awt=]
+		dev-java/icedtea-bin:8[headless-awt=]
+		dev-java/icedtea:8[headless-awt=]
 )"
diff --git a/virtual/jdk/jdk-11-r1.ebuild b/virtual/jdk/jdk-11-r2.ebuild
index 4548106d09bf..d7963a0f6c84 100644
--- a/virtual/jdk/jdk-11-r1.ebuild
+++ b/virtual/jdk/jdk-11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,9 @@ EAPI=7
 DESCRIPTION="Virtual for Java Development Kit (JDK)"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+IUSE="headless-awt"
 
 RDEPEND="|| (
-		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
-		dev-java/openjdk:${SLOT}[gentoo-vm(+)]
+		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+),headless-awt=]
+		dev-java/openjdk:${SLOT}[gentoo-vm(+),headless-awt=]
 )"
diff --git a/virtual/jdk/metadata.xml b/virtual/jdk/metadata.xml
index e6adb0833e2b..f07a294e100c 100644
--- a/virtual/jdk/metadata.xml
+++ b/virtual/jdk/metadata.xml
@@ -5,5 +5,8 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<use>
+		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag>
+	</use>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/virtual/szip/Manifest b/virtual/szip/Manifest
index 809fb6841502..87be20e4b1ef 100644
--- a/virtual/szip/Manifest
+++ b/virtual/szip/Manifest
@@ -1,2 +1,2 @@
-EBUILD szip-2.1.ebuild 334 BLAKE2B a28c8a392964dd84e3ada6393dbb1dd8a5a2b71c30cdd2014e7d99a8ae39628c824f6a5389a4f99b84790dc9e4defef217e78fb7f9c60d5ad2f51bb83fefb0eb SHA512 78560edc629b609cce2e507f547edbde617fe341bb336c52d395e3124edd3570760d52dc3acc92361925d44126dc2afa109e98ccfa7e3929b032479f701f64d8
+EBUILD szip-2.1.ebuild 341 BLAKE2B 8e46c9e097d239573d641429a1e086d6ca647908f746535650abc01dfa17e3d07c3bd69afb5e3cd55ce76d4815e7122902c51662d3ac8b675efa7c0d0bc0af21 SHA512 b7702ccaf2374f2703730431ecfb557c8d7f3384e7c464a497b9e820b7119c3ecc9463d0d2dfc687bb986d4594cb355878c5c7c4a8bac54b666db0b98d64aca7
 MISC metadata.xml 277 BLAKE2B f7ddd373063940f565a3c424a8cc9a3e092d44389a56930db8a875b880d5a6b2ecf644d4605342199f3dde5332caf903bf094daa554bd9abac6919230e371e21 SHA512 970154fcadc29300b663def3d2b5c46b1cb934694850e67ebb72cd9a5d838b602690379db0eac0cb013f618d977e2141df4dee89d0c5fefeb2b672a7dc86ab17
diff --git a/virtual/szip/szip-2.1.ebuild b/virtual/szip/szip-2.1.ebuild
index fc67b7848ae1..606cfe14fd83 100644
--- a/virtual/szip/szip-2.1.ebuild
+++ b/virtual/szip/szip-2.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Virtual for szip compression drop-in replacements"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="|| (
 	sci-libs/libaec[szip]