gentoo resync : 06.04.2022

21 files changed, 13 insertions, 167 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index cad31180f360..2a323238a4ff 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index d7bf91c3b930..5a87b75b1d61 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,12 +1,5 @@
-EBUILD dist-kernel-5.10.106.ebuild 393 BLAKE2B 98940eee8106bf25e3842b8c9b23ad1fb67a964e69efa3bd4e7ab0e98d99d51b83630ef7f9035fdacc2b9a7e493196eeea3c1c3e3a62be33cf7372b57dc800fe SHA512 9b50036ab615ab6792a322d382cef69c975cc9d41151fbbbd66cae49be72e1ee1251a1b06a886f61618009911937cd569bac2b84aaeead4dee443fda4987cd7d
-EBUILD dist-kernel-5.10.107.ebuild 397 BLAKE2B ff0eba4b2d8a2d1b82ba76e0476f4209db7ed94b20473f3e82bfd67583593186a265552cb577013cec25825c89349c4e683b92c9d6ecf6e5559d80409ad58768 SHA512 9a0cfbbaa09ca9cef4532447622452baeebbb1064d4f3b6baf04a6d3717e3eaac5cdfc82f9edb8b48f740d34a2827477f12dfe6f8807b50e25aa5c79c36be36d
-EBUILD dist-kernel-5.10.108.ebuild 397 BLAKE2B ff0eba4b2d8a2d1b82ba76e0476f4209db7ed94b20473f3e82bfd67583593186a265552cb577013cec25825c89349c4e683b92c9d6ecf6e5559d80409ad58768 SHA512 9a0cfbbaa09ca9cef4532447622452baeebbb1064d4f3b6baf04a6d3717e3eaac5cdfc82f9edb8b48f740d34a2827477f12dfe6f8807b50e25aa5c79c36be36d
-EBUILD dist-kernel-5.15.29.ebuild 393 BLAKE2B 98940eee8106bf25e3842b8c9b23ad1fb67a964e69efa3bd4e7ab0e98d99d51b83630ef7f9035fdacc2b9a7e493196eeea3c1c3e3a62be33cf7372b57dc800fe SHA512 9b50036ab615ab6792a322d382cef69c975cc9d41151fbbbd66cae49be72e1ee1251a1b06a886f61618009911937cd569bac2b84aaeead4dee443fda4987cd7d
-EBUILD dist-kernel-5.15.30.ebuild 397 BLAKE2B ff0eba4b2d8a2d1b82ba76e0476f4209db7ed94b20473f3e82bfd67583593186a265552cb577013cec25825c89349c4e683b92c9d6ecf6e5559d80409ad58768 SHA512 9a0cfbbaa09ca9cef4532447622452baeebbb1064d4f3b6baf04a6d3717e3eaac5cdfc82f9edb8b48f740d34a2827477f12dfe6f8807b50e25aa5c79c36be36d
-EBUILD dist-kernel-5.15.31.ebuild 397 BLAKE2B ff0eba4b2d8a2d1b82ba76e0476f4209db7ed94b20473f3e82bfd67583593186a265552cb577013cec25825c89349c4e683b92c9d6ecf6e5559d80409ad58768 SHA512 9a0cfbbaa09ca9cef4532447622452baeebbb1064d4f3b6baf04a6d3717e3eaac5cdfc82f9edb8b48f740d34a2827477f12dfe6f8807b50e25aa5c79c36be36d
-EBUILD dist-kernel-5.16.16.ebuild 397 BLAKE2B ff0eba4b2d8a2d1b82ba76e0476f4209db7ed94b20473f3e82bfd67583593186a265552cb577013cec25825c89349c4e683b92c9d6ecf6e5559d80409ad58768 SHA512 9a0cfbbaa09ca9cef4532447622452baeebbb1064d4f3b6baf04a6d3717e3eaac5cdfc82f9edb8b48f740d34a2827477f12dfe6f8807b50e25aa5c79c36be36d
-EBUILD dist-kernel-5.16.17.ebuild 397 BLAKE2B ff0eba4b2d8a2d1b82ba76e0476f4209db7ed94b20473f3e82bfd67583593186a265552cb577013cec25825c89349c4e683b92c9d6ecf6e5559d80409ad58768 SHA512 9a0cfbbaa09ca9cef4532447622452baeebbb1064d4f3b6baf04a6d3717e3eaac5cdfc82f9edb8b48f740d34a2827477f12dfe6f8807b50e25aa5c79c36be36d
-EBUILD dist-kernel-5.4.185.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
-EBUILD dist-kernel-5.4.186.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
-EBUILD dist-kernel-5.4.187.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
+EBUILD dist-kernel-5.10.109.ebuild 393 BLAKE2B 98940eee8106bf25e3842b8c9b23ad1fb67a964e69efa3bd4e7ab0e98d99d51b83630ef7f9035fdacc2b9a7e493196eeea3c1c3e3a62be33cf7372b57dc800fe SHA512 9b50036ab615ab6792a322d382cef69c975cc9d41151fbbbd66cae49be72e1ee1251a1b06a886f61618009911937cd569bac2b84aaeead4dee443fda4987cd7d
+EBUILD dist-kernel-5.15.32.ebuild 393 BLAKE2B 98940eee8106bf25e3842b8c9b23ad1fb67a964e69efa3bd4e7ab0e98d99d51b83630ef7f9035fdacc2b9a7e493196eeea3c1c3e3a62be33cf7372b57dc800fe SHA512 9b50036ab615ab6792a322d382cef69c975cc9d41151fbbbd66cae49be72e1ee1251a1b06a886f61618009911937cd569bac2b84aaeead4dee443fda4987cd7d
+EBUILD dist-kernel-5.16.18.ebuild 397 BLAKE2B ff0eba4b2d8a2d1b82ba76e0476f4209db7ed94b20473f3e82bfd67583593186a265552cb577013cec25825c89349c4e683b92c9d6ecf6e5559d80409ad58768 SHA512 9a0cfbbaa09ca9cef4532447622452baeebbb1064d4f3b6baf04a6d3717e3eaac5cdfc82f9edb8b48f740d34a2827477f12dfe6f8807b50e25aa5c79c36be36d
+EBUILD dist-kernel-5.4.188.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.10.108.ebuild b/virtual/dist-kernel/dist-kernel-5.10.108.ebuild
deleted file mode 100644
index 8c4f59516aed..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.108.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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 ~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.10.106.ebuild b/virtual/dist-kernel/dist-kernel-5.10.109.ebuild
index f97b93961986..f97b93961986 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.106.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.109.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.15.30.ebuild b/virtual/dist-kernel/dist-kernel-5.15.30.ebuild
deleted file mode 100644
index 8c4f59516aed..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.15.30.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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 ~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.15.31.ebuild b/virtual/dist-kernel/dist-kernel-5.15.31.ebuild
deleted file mode 100644
index 8c4f59516aed..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.15.31.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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 ~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.15.29.ebuild b/virtual/dist-kernel/dist-kernel-5.15.32.ebuild
index f97b93961986..f97b93961986 100644
--- a/virtual/dist-kernel/dist-kernel-5.15.29.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.15.32.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.16.16.ebuild b/virtual/dist-kernel/dist-kernel-5.16.16.ebuild
deleted file mode 100644
index 8c4f59516aed..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.16.16.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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 ~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.16.17.ebuild b/virtual/dist-kernel/dist-kernel-5.16.17.ebuild
deleted file mode 100644
index 8c4f59516aed..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.16.17.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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 ~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.10.107.ebuild b/virtual/dist-kernel/dist-kernel-5.16.18.ebuild
index 8c4f59516aed..8c4f59516aed 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.107.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.16.18.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.4.186.ebuild b/virtual/dist-kernel/dist-kernel-5.4.186.ebuild
deleted file mode 100644
index 2e0a7cc6b4b7..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.186.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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/dist-kernel/dist-kernel-5.4.187.ebuild b/virtual/dist-kernel/dist-kernel-5.4.187.ebuild
deleted file mode 100644
index 2e0a7cc6b4b7..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.187.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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/dist-kernel/dist-kernel-5.4.185.ebuild b/virtual/dist-kernel/dist-kernel-5.4.188.ebuild
index cbaab94293d4..cbaab94293d4 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.185.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.188.ebuild
diff --git a/virtual/httpd-php/Manifest b/virtual/httpd-php/Manifest
index d5f96653ee0a..28765b500220 100644
--- a/virtual/httpd-php/Manifest
+++ b/virtual/httpd-php/Manifest
@@ -1,4 +1,3 @@
-EBUILD httpd-php-7.3.ebuild 418 BLAKE2B 02fabb5753e21d7d215908603b28f39f81dd1e1a75705659be6896ef2626ba96109ed439bc9965ac61c31e9395c7279156b771595e445c5990a9df6cb6eba1ff SHA512 4e056c238bc4f999fb56b919f3c58f8ebee7acf02e2096775144edb6e4a04132eac33f1cd8c8537083f2d044d499aa8186ef170123d8cdeb64aaffe2aae81a6b
 EBUILD httpd-php-7.4.ebuild 425 BLAKE2B 259e7a664b5cf5d23bf3e7f640b3e7fa8a3bac58cbb3b05d728281ecfdd0f896e2afd717046e17bc10b6650786aec1ae169a5f991c10d0de586190d7f882649c SHA512 f0f5ddd9a5897fba9d8d75c4d7c14dc3070e3e79824e58824827d8ef3380a39800b7622cd6449b6d20cfdf05fc65e755568772060135aecf78c02da92a099ea6
 EBUILD httpd-php-8.0.ebuild 425 BLAKE2B 259e7a664b5cf5d23bf3e7f640b3e7fa8a3bac58cbb3b05d728281ecfdd0f896e2afd717046e17bc10b6650786aec1ae169a5f991c10d0de586190d7f882649c SHA512 f0f5ddd9a5897fba9d8d75c4d7c14dc3070e3e79824e58824827d8ef3380a39800b7622cd6449b6d20cfdf05fc65e755568772060135aecf78c02da92a099ea6
 EBUILD httpd-php-8.1.ebuild 432 BLAKE2B be42d89a35196078df0d3c8a05b79765e054930aec287c4587a952d972084c3f234e9d85bdf1d2ba16c6181e86b932f64c36baa84618e5a4b7116e03040b7c4a SHA512 a12d5297ba7ebecc3db42e5451cdcfa340b2eaa29f679b62bb2275625a6076f3173d2414aeb7ece85602b55495417e96a4f6e23fac566b2403188dbfb2bd1192
diff --git a/virtual/httpd-php/httpd-php-7.3.ebuild b/virtual/httpd-php/httpd-php-7.3.ebuild
deleted file mode 100644
index 1b8858b546c2..000000000000
--- a/virtual/httpd-php/httpd-php-7.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual to provide PHP-enabled webservers"
-SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
-			  dev-lang/php:${SLOT}[apache2]
-			  dev-lang/php:${SLOT}[cgi] )"
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 3fd81477fc0c..5c97d462c898 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 370 BLAKE2B 509f7ca0355f743c82d36222ea8ced03d727cfaa2ad82ea784e21e4eefae40fc71dd8aaa47c6201f0c55a72160bc40b96f16e3b17f5710c8ff0c9ec7487a5029 SHA512 7189229d33132c9cf48a86e723e11ca3a8e5240bc7384b4c621745baa927cb4c5c07d8fe1d7750e094cc9e4b72ac24205194adf2f49add4a11961abdd5f88179
+EBUILD jdk-11-r2.ebuild 369 BLAKE2B ae8ce5c108d0ba8c5ce4583801c73ab10b70f923d014cd629775e1e759198d169da155b8410737a8bcf87b2b212c5ed2a7f265750c92c7d6356d4a9124ac4083 SHA512 b18f5903f48837a0fe3ff35430337071b4880d3e5b33921f91a696972c306031ab86368b9555129ef943cc2602c9b6a707701c3dfb69ef2c4b5f97560347e009
 EBUILD jdk-17.ebuild 368 BLAKE2B 62b930d57535aec19061d8af0444b227e327717b0396cd0c785bbd75d02b71456317d41c4dfaa41a080865e0263fc6ec78e737dc3937aa0f3db3523869b1de87 SHA512 6ef4bbd5949c0d074813337cea3a268be1f65b274ed28792695fac7eac242f1c3ce4964dc1a9fa248080332287eda1088b7a05dd35e7b15d6ccbe740c5f7fe01
 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 53f630ccf944..7032cca35142 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 x86"
 IUSE="headless-awt"
 
 RDEPEND="|| (
diff --git a/virtual/jpeg/Manifest b/virtual/jpeg/Manifest
index 302adcb1f038..d6feb8058bf4 100644
--- a/virtual/jpeg/Manifest
+++ b/virtual/jpeg/Manifest
@@ -1,2 +1,2 @@
-EBUILD jpeg-100.ebuild 603 BLAKE2B 72449255edc3938b0f8935f0c03b0bc791584788b804913dbc71708c3c0af47d6c02015de5a0b69a3e8c014fe7a50f1dcc3576c308f24c93ca05c359a9e2dff8 SHA512 ca04e81d6380c9b917ed68b7dace21c7ff604505dde6958a49c324663b368d039b4edca725ad79ecd4c25ed625a34eb50edc062cdbfa90243eef8657ced04677
+EBUILD jpeg-100-r1.ebuild 537 BLAKE2B eec8f6912145cb43b29c3ecdb69a1038c7d1f441ecb6fa020fa093e6d398faff4c6dbf5fed16b647595a58fea6a27d4a63d35c59e1397193560b003c541bfd7a SHA512 60156eb939b2795b64605cc3ed5f80475bef21edd22416da114b7d24ca48ff92b60ffe74dc3ccd5f3e50fe98464ba3c237879b4b55e5338f0a57788a27e02a7f
 MISC metadata.xml 278 BLAKE2B dfec8ae3d98f446778a3eddc5382a412401a911fd7344f440c806cd0f64b1918a99fb67548a5fc2560ad917af337ee58a62833d821e80eeb45686568a5953c59 SHA512 b6e271c28fa50f7c0a882068a6f2048c288374d101421b6e1699dc7605164234749d700520a34498c4d0eb7dad938b09f3e71c4e34e951b8d6182b483787f650
diff --git a/virtual/jpeg/jpeg-100.ebuild b/virtual/jpeg/jpeg-100-r1.ebuild
index 9f8f55c5ff20..871f682b4bfb 100644
--- a/virtual/jpeg/jpeg-100.ebuild
+++ b/virtual/jpeg/jpeg-100-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND="|| (
-		>=media-libs/libjpeg-turbo-1.5.3-r2:0[static-libs?,${MULTILIB_USEDEP}]
-		>=media-libs/jpeg-9c:0[static-libs?,${MULTILIB_USEDEP}]
-		)"
+RDEPEND="
+	>=media-libs/libjpeg-turbo-1.5.3-r2:0[static-libs?,${MULTILIB_USEDEP}]
+"
diff --git a/virtual/jre/Manifest b/virtual/jre/Manifest
index 47745f46bd18..499afb00d6aa 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 311 BLAKE2B d6f39fd3fa1c839f8e22fac40e212bd4d49cb6d82a64ace473b6adb1f70c66c829671fa61ec3ebc6fd710c850625bfe8ec1627266c3dfda433318349648afb85 SHA512 e12d6f64cded1a101925ee06980fa1ef83d59e7c809282cda99393fadd230954f40b9ce57a5817893c7394bebe45b32c07200cecc852988ec6a758b68ea6bdc2
+EBUILD jre-11-r2.ebuild 310 BLAKE2B 050d81ea818e1e34575222f1b9f6ec9213357a1039ec17a6e7fc7b78b561a1f9c4e78a04e49c43263b2631ec8400e3156544d1289683272cecfc18b9cfc600b2 SHA512 7fd891f91d21453e226c8b3b7a98dc1f56e00cd3ec26bb39265ca52576fa307f3b46d94d77f5dbf77be314dce9a15339bc53986722d196388b5044f1a289b640
 EBUILD jre-17.ebuild 309 BLAKE2B 94028e7d13318e1afd205542d28f0b7c0377ffcc9d941fc94bca8761b6cc6d20bb07987d8777863376cdc7d0165b1c6f53e135945a2db0543314cae0db03ce5d SHA512 29ca37ff83300bf2fe7e427dead3b1997e1631517bc7638152f3da4be64b7eb8fc3bd28f71c35f3ae3370f969122accd0d1427b463b5ce23fd0262055c42a5af
 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 d9ace266def2..4715fadc1b67 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 x86"
 
 RDEPEND="|| (
 		virtual/jdk:${SLOT}