gentoo resync : 15.06.2021

23 files changed, 41 insertions, 207 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 732a3581c135..543e95d0a73f 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 18557705e5c6..d87a29cbd2b3 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,15 +1,6 @@
-EBUILD dist-kernel-5.10.33.ebuild 383 BLAKE2B 80eec9edaf8e2502e3d24e3c4c48b98ef709ff2236aab76f8a1885f3423822c2f323cdb401e881f49f19c2a10024d69e97080e4ea265e62b7538c6500871d2af SHA512 232d47e93114609f82b9fb34db5cdf25f4519d5ae9942cebbf6018b554fc4f9a0486b37b8b83646b504fc8a75856af061c1c7d9516f91556ef01adb11b775322
-EBUILD dist-kernel-5.10.38.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.10.39.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.10.40.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.10.41.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.11.22.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.12.6.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.12.7.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.12.8.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.4.115.ebuild 378 BLAKE2B 425766351233e0cc1717be1ad4fd1e200bc799f0aba6693f174bc043be6a179616a25797d8411897c3fe6dcac975f3d7917d33171d3e0cfea8e842586ff68808 SHA512 763d2b93d60d712cdca6dfb85666b79d3e678a8ea3969609c8edd8f96f05d372cb768718893cbf7dc85e0a4615b1d3842fc1423d287e07c598d30f0bd321cf29
-EBUILD dist-kernel-5.4.120.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
-EBUILD dist-kernel-5.4.121.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
-EBUILD dist-kernel-5.4.122.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
-EBUILD dist-kernel-5.4.123.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
+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.12.10.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
 MISC metadata.xml 290 BLAKE2B bcb7e629ba04928387a13bfb6b95fc2acce4d8b2bdf2669ea1c6299a954c8e94b0e3b4d65cd4b424dd8da2e33405bfd0cac3a12ff2603faad3f69b516d0f0aa4 SHA512 6b8c9a6b6055c46b0cce5bbd155d53a0dd1115edaad016bade7fc1cbe3ee4a9c2097fa3392f9df6830546b36c65cdf99cf2ffda40a313117ab5f32249677c753
diff --git a/virtual/dist-kernel/dist-kernel-5.10.33.ebuild b/virtual/dist-kernel/dist-kernel-5.10.33.ebuild
deleted file mode 100644
index 340ca7eb117e..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.33.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.38.ebuild b/virtual/dist-kernel/dist-kernel-5.10.38.ebuild
index 3df38272de32..340ca7eb117e 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.38.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.38.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.41.ebuild b/virtual/dist-kernel/dist-kernel-5.10.41.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.41.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.39.ebuild b/virtual/dist-kernel/dist-kernel-5.10.43.ebuild
index 3df38272de32..3df38272de32 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.39.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.43.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.11.22.ebuild b/virtual/dist-kernel/dist-kernel-5.11.22.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.11.22.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.40.ebuild b/virtual/dist-kernel/dist-kernel-5.12.10.ebuild
index 3df38272de32..3df38272de32 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.40.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.12.10.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.12.6.ebuild b/virtual/dist-kernel/dist-kernel-5.12.6.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.6.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.7.ebuild b/virtual/dist-kernel/dist-kernel-5.12.7.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.7.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.8.ebuild b/virtual/dist-kernel/dist-kernel-5.12.8.ebuild
deleted file mode 100644
index 3df38272de32..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.12.8.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.4.115.ebuild b/virtual/dist-kernel/dist-kernel-5.4.115.ebuild
deleted file mode 100644
index 98a5bc7d0b98..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.115.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.120.ebuild b/virtual/dist-kernel/dist-kernel-5.4.120.ebuild
index 11d6573ded7c..98a5bc7d0b98 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.120.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.120.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.122.ebuild b/virtual/dist-kernel/dist-kernel-5.4.122.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.122.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.123.ebuild b/virtual/dist-kernel/dist-kernel-5.4.123.ebuild
deleted file mode 100644
index 11d6573ded7c..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.123.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.121.ebuild b/virtual/dist-kernel/dist-kernel-5.4.125.ebuild
index 11d6573ded7c..11d6573ded7c 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.121.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.125.ebuild
diff --git a/virtual/freedesktop-icon-theme/Manifest b/virtual/freedesktop-icon-theme/Manifest
index 1eec03225747..8f6059186002 100644
--- a/virtual/freedesktop-icon-theme/Manifest
+++ b/virtual/freedesktop-icon-theme/Manifest
@@ -1,2 +1,2 @@
-EBUILD freedesktop-icon-theme-0-r4.ebuild 553 BLAKE2B 4689bd8cf4df3f8b80c9e6fcf98b7aee9442ebcf5ea78b7d80a016af78d66b00b2bc1fd3133f08e3a0ad768fcc1d84d8ecbbf81a863c0385a90ac01491c4e72b SHA512 cd6885b9c219817c879e3c8cee4d3b3052646c3117bcf476cb69375a9c2f96cc6f524c20b16cd298ea23fa9cc0faec62a0dffd72f96210922a91a8ed4f4352d6
+EBUILD freedesktop-icon-theme-0-r4.ebuild 560 BLAKE2B 989470d8f78f79c423d0b3f4efa498f4c253eb3bbd452da7b219ceed014ad77f2fd6929945bf483d69fe083e270176e442dd736d43858cf4d3eb6e576747fe62 SHA512 c0ff81b9fd3f72a377e437c9a6af90aac351d48628ceb1c8a01ed0d4869214c568ab5a5fbfb3d51212a1e910e788f49ce3990181402695bacec784a4ad96bd9d
 MISC metadata.xml 252 BLAKE2B 269351d5fec6de1f8236181ef68d9a75ee1f8dca300a841e4e710502a04cc5383cd310672f7b629185647e441fb4e0b49edce1a39f3c2b2607c5e9d4897fdcb0 SHA512 5829caf1025801115ab3af6b5036f61fbdacf2d84cac533fc0d61e348d8387d19796469c213422f98fd61587ecb483b00b6993ae30434fa5e89e5361aeadc6bf
diff --git a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r4.ebuild b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r4.ebuild
index d6e1ae1370da..6b284270956c 100644
--- a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r4.ebuild
+++ b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual to choose between different icon themes"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="|| (
 	x11-themes/adwaita-icon-theme
diff --git a/virtual/gnustep-back/Manifest b/virtual/gnustep-back/Manifest
index 8adf0c430bf9..37d8914c6887 100644
--- a/virtual/gnustep-back/Manifest
+++ b/virtual/gnustep-back/Manifest
@@ -1,2 +1,3 @@
 EBUILD gnustep-back-0.28.0.ebuild 409 BLAKE2B 22bbbb3c73e496475c3c8f687b0e08de296573356eabf0a973658a8a7ebd0900db95dabe201e950a62ba33bade17b8956d8338206502d1f2f362c36031e0e4ba SHA512 98b3bba52b8cf50bcb23bb5e92f106ea67860abad37e318b88079d0e0bf2922b9086827060dcc9e4b51bdec7d5f03e3c5f572f72f9048817ebbf4654f3e205af
+EBUILD gnustep-back-0.29.0.ebuild 413 BLAKE2B fdf9432c54be19cdbaae5a9f626383e44eb195bee32f7302417031e9d17f020d3e9ade721c4fad75d16bfde78d7688ed24d3838a6ad27567463ad1f9cc28c64d SHA512 e12e9054ff165f8da7dd81c19bad7f90e6b469c785574a772821c9ea7d83869c9fbc62add5fe4e656fd472bc2ab7f6877b52d68b7305f36138949cb3e9ff39d5
 MISC metadata.xml 281 BLAKE2B 387f004bbf405a677a746c5011af42aa5a3e60283d777bed02cfe07d4bb17ef12c51adab0b02441769cdd28bbc44b1e4dfa65aedf08ed765afdbeb8e8b938729 SHA512 7132cd942c58f4eb5d497b8991eeb61b6c813bfb8e66e509cf8be3075c9ea0e1cea6c76d70fdffa5b4ccd684eaced3f963f31f7739467eda57b5b2a551d41ab8
diff --git a/virtual/gnustep-back/gnustep-back-0.29.0.ebuild b/virtual/gnustep-back/gnustep-back-0.29.0.ebuild
new file mode 100644
index 000000000000..7c22edfe2bff
--- /dev/null
+++ b/virtual/gnustep-back/gnustep-back-0.29.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for back-end component for the GNUstep GUI Library"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="|| (
+		~gnustep-base/gnustep-back-cairo-${PV}
+		~gnustep-base/gnustep-back-art-${PV}
+		~gnustep-base/gnustep-back-xlib-${PV}
+	)"
diff --git a/virtual/ooo/Manifest b/virtual/ooo/Manifest
index 19cc17afec23..178343e92e88 100644
--- a/virtual/ooo/Manifest
+++ b/virtual/ooo/Manifest
@@ -1,2 +1,2 @@
-EBUILD ooo-0.ebuild 336 BLAKE2B 05fae184af03661301b90ae0ac2c61dbc9addf0737e82a30cb73d59bc714dfcea814f256eb8c066ce7c6782165403d6c443d299c93ad0c503d4f6293c9a58a8c SHA512 5f0cbac0e3edae398643e2fc5026ab4a2bc02dd849adea7a41f7404a71ec8becaa9f05ea357c14015a80ca632541b92312048b7edcbafbc147ba59dd8be237ae
+EBUILD ooo-1.ebuild 258 BLAKE2B b3a76e8ae7cc9ce9f5ca5557df7612dcfa3a505690c903c61761c6f3280f753cbf41e816cb888df55d46b7c92ec7c2f69eddb344c595447223d9b420d4abd921 SHA512 5b258f82b38734b9cf278f5309713a46ffc9585e1b677f77fddf2e20fee33e61cb1d6fc44dfabda5408a0ee7502d8b2ac67b706ee4efeff234bad913c29e5a61
 MISC metadata.xml 279 BLAKE2B 1af9aed1706160fc91fbb9353ea9054af1892e77c4c80a582ee3f4318f69a79715ec8074295971e0c37a7f6dd5182421ab1cb5ed3597342f524e3101f26c70b3 SHA512 ace29852d9e7ab99964cb6cef245ed66aa64535ba94693e16fb493c81dd6d8f59f525622d67e6dc701521aa7be8f997f6e14849c06d5e0ef219b3b50ae47f157
diff --git a/virtual/ooo/ooo-0.ebuild b/virtual/ooo/ooo-0.ebuild
deleted file mode 100644
index dee577344ac0..000000000000
--- a/virtual/ooo/ooo-0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for OpenOffice.org/LibreOffice"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="java"
-
-RDEPEND="
-	|| (
-		app-office/libreoffice[java?]
-		app-office/libreoffice-bin[java?]
-		app-office/openoffice-bin[java?]
-	)
-"
diff --git a/virtual/ooo/ooo-1.ebuild b/virtual/ooo/ooo-1.ebuild
new file mode 100644
index 000000000000..99c3de6326fb
--- /dev/null
+++ b/virtual/ooo/ooo-1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for LibreOffice"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	|| (
+		app-office/libreoffice
+		app-office/libreoffice-bin
+	)
+"