gentoo resync : 16.01.2021

18 files changed, 152 insertions, 26 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index e0ec76048ac2..22c1a230c1ff 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 2cccf18317ca..0a7787455dda 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,11 +1,17 @@
 EBUILD dist-kernel-5.10.88.ebuild 388 BLAKE2B 1fd4d5f1c4048019e903139e53d95f5e51081ef0a3f07c4736b88ea2e9ea96cfb039f8e548dd116adf714d381255d31505324a82c85547d4b125dff53611a63d SHA512 bb6d72f4dec0827535a562b9c96a80853db64f8e43c43127365002360354397437a567e24acf1aa339cd0913cabf78eb0a1db5152c70048971d2d451e68518f1
 EBUILD dist-kernel-5.10.89.ebuild 392 BLAKE2B 17f0af9f9612de6bdb01304f7e7801f160b1ac02cce5fefce33b65b89dc3a3a4ceef0a90370b780aba1b3c6b92ba33d1ad932942253593cf64cfe4387146df29 SHA512 6f872f0b88aa8c3d16843ba88ad474bb25810e9ca611d1a0fb8834caa6069f94618b8508d9de49dc9ae7736ffe0b385f12bee2dc95bc1dd1e242c9d26d1d5b14
 EBUILD dist-kernel-5.10.90.ebuild 397 BLAKE2B ff0eba4b2d8a2d1b82ba76e0476f4209db7ed94b20473f3e82bfd67583593186a265552cb577013cec25825c89349c4e683b92c9d6ecf6e5559d80409ad58768 SHA512 9a0cfbbaa09ca9cef4532447622452baeebbb1064d4f3b6baf04a6d3717e3eaac5cdfc82f9edb8b48f740d34a2827477f12dfe6f8807b50e25aa5c79c36be36d
+EBUILD dist-kernel-5.10.91.ebuild 397 BLAKE2B ff0eba4b2d8a2d1b82ba76e0476f4209db7ed94b20473f3e82bfd67583593186a265552cb577013cec25825c89349c4e683b92c9d6ecf6e5559d80409ad58768 SHA512 9a0cfbbaa09ca9cef4532447622452baeebbb1064d4f3b6baf04a6d3717e3eaac5cdfc82f9edb8b48f740d34a2827477f12dfe6f8807b50e25aa5c79c36be36d
+EBUILD dist-kernel-5.10.92.ebuild 397 BLAKE2B ff0eba4b2d8a2d1b82ba76e0476f4209db7ed94b20473f3e82bfd67583593186a265552cb577013cec25825c89349c4e683b92c9d6ecf6e5559d80409ad58768 SHA512 9a0cfbbaa09ca9cef4532447622452baeebbb1064d4f3b6baf04a6d3717e3eaac5cdfc82f9edb8b48f740d34a2827477f12dfe6f8807b50e25aa5c79c36be36d
 EBUILD dist-kernel-5.14.21.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
-EBUILD dist-kernel-5.15.11.ebuild 389 BLAKE2B 3a6730e0f231281dacfea2d1f5536c416b444b27dd064cc61c575ac42001b27ef3b238dbd9020ecc627297078a74bfc1a43c726bd854a5fa81cffc6ceeffabe6 SHA512 fa58509c8752c61d5e7e43d53a9c492469b956e8e771f44cc60df9fbc87b1355d2af70b47b303b9c1edc767e217696f1b4e6e330f0591a6d238b290b62d5b5ad
+EBUILD dist-kernel-5.15.11.ebuild 393 BLAKE2B 98940eee8106bf25e3842b8c9b23ad1fb67a964e69efa3bd4e7ab0e98d99d51b83630ef7f9035fdacc2b9a7e493196eeea3c1c3e3a62be33cf7372b57dc800fe SHA512 9b50036ab615ab6792a322d382cef69c975cc9d41151fbbbd66cae49be72e1ee1251a1b06a886f61618009911937cd569bac2b84aaeead4dee443fda4987cd7d
 EBUILD dist-kernel-5.15.12.ebuild 392 BLAKE2B 17f0af9f9612de6bdb01304f7e7801f160b1ac02cce5fefce33b65b89dc3a3a4ceef0a90370b780aba1b3c6b92ba33d1ad932942253593cf64cfe4387146df29 SHA512 6f872f0b88aa8c3d16843ba88ad474bb25810e9ca611d1a0fb8834caa6069f94618b8508d9de49dc9ae7736ffe0b385f12bee2dc95bc1dd1e242c9d26d1d5b14
 EBUILD dist-kernel-5.15.13.ebuild 397 BLAKE2B ff0eba4b2d8a2d1b82ba76e0476f4209db7ed94b20473f3e82bfd67583593186a265552cb577013cec25825c89349c4e683b92c9d6ecf6e5559d80409ad58768 SHA512 9a0cfbbaa09ca9cef4532447622452baeebbb1064d4f3b6baf04a6d3717e3eaac5cdfc82f9edb8b48f740d34a2827477f12dfe6f8807b50e25aa5c79c36be36d
+EBUILD dist-kernel-5.15.14.ebuild 397 BLAKE2B ff0eba4b2d8a2d1b82ba76e0476f4209db7ed94b20473f3e82bfd67583593186a265552cb577013cec25825c89349c4e683b92c9d6ecf6e5559d80409ad58768 SHA512 9a0cfbbaa09ca9cef4532447622452baeebbb1064d4f3b6baf04a6d3717e3eaac5cdfc82f9edb8b48f740d34a2827477f12dfe6f8807b50e25aa5c79c36be36d
+EBUILD dist-kernel-5.15.15.ebuild 397 BLAKE2B ff0eba4b2d8a2d1b82ba76e0476f4209db7ed94b20473f3e82bfd67583593186a265552cb577013cec25825c89349c4e683b92c9d6ecf6e5559d80409ad58768 SHA512 9a0cfbbaa09ca9cef4532447622452baeebbb1064d4f3b6baf04a6d3717e3eaac5cdfc82f9edb8b48f740d34a2827477f12dfe6f8807b50e25aa5c79c36be36d
 EBUILD dist-kernel-5.4.168.ebuild 383 BLAKE2B 3610d8d07e822b083b590c0c5c1eb03589b1810a78b42cffeecd1d6e34a8e7a956101076cba327e2e78cde15c9bb5a25a9ec66989ebf3c56455b42db6975aabb SHA512 26923156c371e9b0c153ba57661bd7eddfa956b6a90949e1713347a1aacf5978270ec729525cc27fd4390a7424b173dea4a1692234c7f8ceb3524a7af23944ad
 EBUILD dist-kernel-5.4.169.ebuild 387 BLAKE2B b16788800bd2b053c57b904a7da221cc3d8dd8d443d2d56e1ca32ad27a871b9e74085e83980aa20363e7ad668b9049826a8259f9b835cc116f9b050055ac095e SHA512 dcdf836c5d4b23d175f45beaa2dbe55d8fc927f87e2b7bf37cec302cd411eeac5c77d6e7e9475735c62b05c04f127f7b0d2f2c4bc5ac042c890c4a581559cf45
 EBUILD dist-kernel-5.4.170.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
+EBUILD dist-kernel-5.4.171.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
+EBUILD dist-kernel-5.4.172.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.10.91.ebuild b/virtual/dist-kernel/dist-kernel-5.10.91.ebuild
new file mode 100644
index 000000000000..8c4f59516aed
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.91.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 ~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.92.ebuild b/virtual/dist-kernel/dist-kernel-5.10.92.ebuild
new file mode 100644
index 000000000000..8c4f59516aed
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.92.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 ~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.11.ebuild b/virtual/dist-kernel/dist-kernel-5.15.11.ebuild
index 415ac7f16e6a..f97b93961986 100644
--- a/virtual/dist-kernel/dist-kernel-5.15.11.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.15.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/dist-kernel/dist-kernel-5.15.14.ebuild b/virtual/dist-kernel/dist-kernel-5.15.14.ebuild
new file mode 100644
index 000000000000..8c4f59516aed
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.15.14.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 ~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.15.ebuild b/virtual/dist-kernel/dist-kernel-5.15.15.ebuild
new file mode 100644
index 000000000000..8c4f59516aed
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.15.15.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 ~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.171.ebuild b/virtual/dist-kernel/dist-kernel-5.4.171.ebuild
new file mode 100644
index 000000000000..2e0a7cc6b4b7
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.171.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/dist-kernel/dist-kernel-5.4.172.ebuild b/virtual/dist-kernel/dist-kernel-5.4.172.ebuild
new file mode 100644
index 000000000000..2e0a7cc6b4b7
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.172.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/jack/Manifest b/virtual/jack/Manifest
index da69dc4075f5..4d7094bb55b1 100644
--- a/virtual/jack/Manifest
+++ b/virtual/jack/Manifest
@@ -1,2 +1,2 @@
-EBUILD jack-2.ebuild 513 BLAKE2B 75cc2d67f8dd0b92753bf8285d638fd3f53067c811a508a067f5734e8a6f57579af8036f7a37490d06ffb29968db13280b10cbbb5311176537f3ddb9874731b0 SHA512 c8bc22d5e7d70e70581dea0948579b59b2dea1ed6e94d2ea4e1224a9eecbfa8fb4c91a382a5ebc5c671840c4858e57d3a076a5e402afcf0c06aac002e7da3db5
+EBUILD jack-2.ebuild 507 BLAKE2B b492b0c28456f35f98b8ada643bbdf42430c46698a7bb3c98d61a6bdcdb4756a33171aaf83a934a2e80b08083adafe2127eb14fd40566fe115a63ba978f5df40 SHA512 44f4df0f1455fa716db7fa2ade7d8942ee8f928ef3c2c841da3e056709b5f1562e4e115cfd5bdfffeaeeeafc645671299711cbcaea23d933b8f66d2b8e0a782d
 MISC metadata.xml 284 BLAKE2B 00ac0798b5277d743834ec7211d08e632ca2b53ec988ed462b93460e1412e2814d5e5eca9eb8f5c32fd93ffb11fe8501d7cd95850cb34abe6f495464b04960b3 SHA512 a2642a6f1785c4d52c59d37baf509bfb25411722c09370c8ccb2323d8129b8031988949c4a373bdca48b8ee9e1ba9fea0e7ebbadc367a696acf53ff38e3b21e4
diff --git a/virtual/jack/jack-2.ebuild b/virtual/jack/jack-2.ebuild
index 356b824079f9..03ee186c4669 100644
--- a/virtual/jack/jack-2.ebuild
+++ b/virtual/jack/jack-2.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
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for JACK Audio Connection Kit"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/linux-sources/Manifest b/virtual/linux-sources/Manifest
index 89ff4643c48e..093774e8284d 100644
--- a/virtual/linux-sources/Manifest
+++ b/virtual/linux-sources/Manifest
@@ -1,2 +1,2 @@
-EBUILD linux-sources-3-r6.ebuild 632 BLAKE2B 7ca42434a155017a0b386c80f536c7819479a59477f451f5d3b4192acf262a24fdba201b1cbc0f176f0799a747f9bf55a16683b8b6da13b0d068f33436ecfcd4 SHA512 62ce6c20d874104825f28a39cfccb6c6d2d733fc14b54fee33b7efa71d8f0d7f6c132c20ddc75a514718eb322fc113fb22527727544c3fb3914e44d836fc49dc
+EBUILD linux-sources-3-r6.ebuild 638 BLAKE2B 4c2f590674c576ac708f052dd4840e6ca58cc4031d218bf79485bac2ae3307e6dd772f28bae65764f57e97f64d554778ba473cd91335524d7c11ce2a09436f10 SHA512 5b5e26e49872aca4aa26aaa2ee42607a4cbc5f4adb15812ad2496410582a85a20c6f0505433c7647e45e5eccc1db8c50f1eb7d0fd7fb4ae860b6b888d18200d0
 MISC metadata.xml 469 BLAKE2B 3754fd2d966d69d52c48a4b0ca6e0d33951a439fdd9d4348bd69a871080ad1cf37befadea2d5d93b40db2a1dd201c0129af9be71278babddfce37de07f049c66 SHA512 7959593a1fc113146d58b1a80386494f8540ac02e0700c189a97e4835f494887ee701c393d4bcfd06e5c468add19148735a936f0bb252278d91fa593f64335f4
diff --git a/virtual/linux-sources/linux-sources-3-r6.ebuild b/virtual/linux-sources/linux-sources-3-r6.ebuild
index ab3ca0381172..51f60af192ce 100644
--- a/virtual/linux-sources/linux-sources-3-r6.ebuild
+++ b/virtual/linux-sources/linux-sources-3-r6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for Linux kernel sources"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="firmware"
 
 RDEPEND="
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 7b40a85f8b36..ff93e542a119 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -3,4 +3,5 @@ EBUILD rust-1.54.0.ebuild 411 BLAKE2B 32e1e7089803d7cdd4eb3f4e31bb727a83f0b1af10
 EBUILD rust-1.55.0.ebuild 411 BLAKE2B 32e1e7089803d7cdd4eb3f4e31bb727a83f0b1af103cefa0e31ff479f8017f3be9d1fd4c595bf6e7d00541839b618f5ac51febd75537ce7e66991741998e2eae SHA512 a8d2f7491a8750c8f560c6b1c6f64d9c405deec340c7bbe8e3e01a2d137bd616caa2db2dbe45df1a6e37d0ee4c90a279f4c6462147a1544736c5f6b3eca6c48a
 EBUILD rust-1.56.1.ebuild 406 BLAKE2B 55a09e36f1d03cec045d994929ece183f272ff9f942508095387f94731b0cf5619ba4c58de84b1a9cd5ddad895936f13cee17967fe4fd965f1762a1c1dad2fed SHA512 54739a9836eeb250627c336604128e83dc5b36e03fe218fd4ce05a0e0fa748a69658fa6233be142baec31c0a6e8adec4dd9bf1a7b05b5ab2b54e9cf18877c365
 EBUILD rust-1.57.0.ebuild 411 BLAKE2B 32e1e7089803d7cdd4eb3f4e31bb727a83f0b1af103cefa0e31ff479f8017f3be9d1fd4c595bf6e7d00541839b618f5ac51febd75537ce7e66991741998e2eae SHA512 a8d2f7491a8750c8f560c6b1c6f64d9c405deec340c7bbe8e3e01a2d137bd616caa2db2dbe45df1a6e37d0ee4c90a279f4c6462147a1544736c5f6b3eca6c48a
+EBUILD rust-1.58.0.ebuild 411 BLAKE2B 645ff28e91a8c9aa68a536aca544ffb4629bad65355b41cc6bd5bddb364191c692ad40e874a77a2009c69a09ec9d4355765dd1b76e0895a8b91b1a1d88814ccd SHA512 68d03f960219ce98355b033ad01e899851f5d0c266ffa4f1c51a85f6666de5ec1a20bff9e00843ad07f8503fd4c9d071e531ee9d172c0c986d9e1b04c0340af0
 MISC metadata.xml 351 BLAKE2B cf3c7f2e804dbe6ddce9380d9c7b32e734df16a04ea867a474a4e6868edfaa72abb79dd6eb47f67128a1b60cb4872c999949e8237102bc2117e581309307f862 SHA512 d32137e0b4549baf85ffaff35d2c5fb058a44e3fbeb7f560db3ebbfc1d44d9ce3651e033cb8434f211994218a85d5bf89f42ea9e3ab76e361c1014dcc6f25997
diff --git a/virtual/rust/rust-1.58.0.ebuild b/virtual/rust/rust-1.58.0.ebuild
new file mode 100644
index 000000000000..8de903f38293
--- /dev/null
+++ b/virtual/rust/rust-1.58.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for Rust language compiler"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="rustfmt"
+
+BDEPEND=""
+RDEPEND="|| (
+	~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+	~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+)"
diff --git a/virtual/w3m/Manifest b/virtual/w3m/Manifest
index 27a20328b2a8..8aeafc1da365 100644
--- a/virtual/w3m/Manifest
+++ b/virtual/w3m/Manifest
@@ -1,3 +1,2 @@
-EBUILD w3m-0.ebuild 399 BLAKE2B 0c8a9911c79ef9ae9843180623f91af1ed68da9368dd609517afc6622d9a949b7a26075cd93be3e5d92bb89003ff39705775c2a4f764c1364bf0fa1553a150ca SHA512 663e0b182087c37100fb4cc0282c1a8b46401333525bb12dab4b80df30cbc9a0e35cf495399b8df34a3e001d5cb5166a472dd3f81e2f3fd46a13ac2e422e510c
-EBUILD w3m-1.ebuild 397 BLAKE2B 1547b5760226115279b815953fadf740413dff186d058ab9d3a6b3467314757237db9011fe5851c2049c277bf90869a955501ffa8a4e6238ebb6a826e9f1ca6a SHA512 88f3c4445634db0de84a7e45a8804d0fb8034dc810db84ea44dffd091733e858e98e26975e6a453ea1b345c6f85c94ada6094978a2d36fae12031b835c63f35d
+EBUILD w3m-1.ebuild 396 BLAKE2B e5d23742cb2e6a5e9f97bc426f20d2874e5ac9824cf7ecb7302173d7935004f45c8836ce91e83310efa35fa1a2b3e781758f2f112f28a0a3a0666e1e2b365a28 SHA512 a0bb7e6fd83db6828551ab9a74f060caff82f1b453d3027bef65642cfa8b38769cde9ac19d3cb11d58426e29e2bf259c437d0c666e8a62b8ddee0df759dc687c
 MISC metadata.xml 259 BLAKE2B 473457dc1808c494d8a08c731bc36bc3f6fd42ac730b0e7372e9749275ad413c56abc214d6b8d43c3e3f3d878a81e61d3ac1088b0606e99b449018828f056c4c SHA512 42603797647a4e2bdd69fc8548c0f035143c2a94b836763b39fc0dda770621970fbb233327c142107bca40f48b2b380fe97c6517e5fce633ba2c11f7a34402fc
diff --git a/virtual/w3m/w3m-0.ebuild b/virtual/w3m/w3m-0.ebuild
deleted file mode 100644
index 485e957f4b7f..000000000000
--- a/virtual/w3m/w3m-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual for the w3m web browser"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="|| (
-		www-client/w3m
-		www-client/w3mmee
-	)"
diff --git a/virtual/w3m/w3m-1.ebuild b/virtual/w3m/w3m-1.ebuild
index a62a6f56241d..17526c870c82 100644
--- a/virtual/w3m/w3m-1.ebuild
+++ b/virtual/w3m/w3m-1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for the w3m web browser"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| (
 		www-client/w3m