gentoo resync : 20.03.2021

17 files changed, 70 insertions, 51 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 9e38652370b3..c210a95d5496 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/awk/Manifest b/virtual/awk/Manifest
index 36d9019dd6c5..fd39a138ef08 100644
--- a/virtual/awk/Manifest
+++ b/virtual/awk/Manifest
@@ -1,2 +1,2 @@
-EBUILD awk-1.ebuild 554 BLAKE2B 655db3ab80f832ffc732c72cc530d6295a50d004f51730ca847c0d3b7bdcfddd5d902bb4e7600d8c4cadf97d1f3dedaa319c4c472ccb08ec1b7b56dd6100ff35 SHA512 0fd8f7204650195bdc0736730e4c6d43a9ef01f515139bd34eeed107b90c9111bea116a3f64788293f5df5b95cd38816439478605da5fea6ef92386c5aa73704
+EBUILD awk-1.ebuild 471 BLAKE2B 20b487d55648c93ac7fb682eb9040947bc8b8c2e10ce4960d0878e93a095f06628f1bc03219356dbfe4608438a582be4dd6c824c19233db0e7fab62d3f364d1a SHA512 a0b803e94d6a17a561932a2531d3cb92eedf7e88036dbad99393c1e01b2b802b878da96945c9d10b1e697f2394315e48ba12194cd31babaf686e3b72cc86e9e4
 MISC metadata.xml 385 BLAKE2B d0c65503a8aec0e10e4412c3655df206935ea988ffc0f1285965c3bddb6fe84868f80a95b91612a3dcddc22ed6cb2d616d1e9f5fa294e70a3019a375db72763e SHA512 2e19654d5b258ca5e5737a5b59044d870a3b11211f4c4cd5eb92fd2ce1af8ae1082f04128d57efcd879055bfc223a7d32f5ddc3c0b933d9c0a6279aaa90f5833
diff --git a/virtual/awk/awk-1.ebuild b/virtual/awk/awk-1.ebuild
index d577621d0876..226d14fd6130 100644
--- a/virtual/awk/awk-1.ebuild
+++ b/virtual/awk/awk-1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Virtual for awk implementation"
 SLOT="0"
@@ -13,5 +13,4 @@ RDEPEND="
 		sys-apps/mawk
 		sys-apps/nawk
 		sys-apps/busybox
-	)
-	!<sys-apps/gawk-4.0.1-r1" #before 4.0.1-r1 awk symlinks did belong to gawk #455696
+	)"
diff --git a/virtual/bitcoin-leveldb/Manifest b/virtual/bitcoin-leveldb/Manifest
index 8022bb3ac77b..c3569190e153 100644
--- a/virtual/bitcoin-leveldb/Manifest
+++ b/virtual/bitcoin-leveldb/Manifest
@@ -1,2 +1,2 @@
 EBUILD bitcoin-leveldb-0-r2.ebuild 443 BLAKE2B b5ff9dc33a6b67cac18219e26ff61750a3e6ded41762a530ece26ba08aca3d29f4fbb5799224c1e1e40eda0f95526b6e9df1e98fc2c93d2bb4d08510bc43aab0 SHA512 40833441423f5f76d9b7f34b4970f6fd78911f582b9c9d05e8e19090cd7c40ea5918aa2c43c5133e4435cb63d19d9b95446b69f09892d235af23070081933b12
-MISC metadata.xml 374 BLAKE2B f68f84220cb3bbe941bb5b153cefd80df5b76d14bfe963f7c0b3c687cc8f402eef1012995d461a8fb08b71433c3b606bba6cc38578cdbcc027554752e1b652bb SHA512 a5eeb34d8bb1faad87f3efa627a396af99de202cd13b8d0c2c6424e5b7e059d31755b2465e981707f49837a1c884349bf749117dd4a0cee66c052e31c0069033
+MISC metadata.xml 404 BLAKE2B 562724169bdcba36f216d118b7b362c5f487880cbcaccf6fdabd3a0dbb6d0d21fdd13bd1eb5080139117328277565ffe9021507b0871ec07b048c531b9c55717 SHA512 8a78e509ece3294c6343fccd856537803407685d2aece1ccfeab336f8b0ea482ff38696d21f8d37bba3b0cf5bd2e6718736d6b5c3180c202f0a387e04fc507f1
diff --git a/virtual/bitcoin-leveldb/metadata.xml b/virtual/bitcoin-leveldb/metadata.xml
index 65db17a2078a..95e5c0e2b8fd 100644
--- a/virtual/bitcoin-leveldb/metadata.xml
+++ b/virtual/bitcoin-leveldb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index b5342478e6fb..03b8f6ff3a32 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -5,17 +5,20 @@ EBUILD dist-kernel-5.10.20.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace27
 EBUILD dist-kernel-5.10.21.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.10.22.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.10.23.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.10.24.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.11.2.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.11.3.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.11.4.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.11.5.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.11.6.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.11.7.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.4.100.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.101.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.102.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.103.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.104.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.105.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
+EBUILD dist-kernel-5.4.106.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.94.ebuild 378 BLAKE2B 425766351233e0cc1717be1ad4fd1e200bc799f0aba6693f174bc043be6a179616a25797d8411897c3fe6dcac975f3d7917d33171d3e0cfea8e842586ff68808 SHA512 763d2b93d60d712cdca6dfb85666b79d3e678a8ea3969609c8edd8f96f05d372cb768718893cbf7dc85e0a4615b1d3842fc1423d287e07c598d30f0bd321cf29
 EBUILD dist-kernel-5.4.97.ebuild 379 BLAKE2B 5bdd8cd80c892709cd3f63336849d64c9fdf77b471026a3496fbeb2fba158dee82d2ebebc978956727029648e502b3c9da242e76227817557bcc050a238cec4f SHA512 c72c9849666e1f3e505e3272b4ce72aba2a16df36e172e40e4e7dabd1a76cae847be5234639ddadab1da39a8805202dd2669addead1dcb9cb710b53d0e083a96
 EBUILD dist-kernel-5.4.99.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
diff --git a/virtual/dist-kernel/dist-kernel-5.10.24.ebuild b/virtual/dist-kernel/dist-kernel-5.10.24.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.24.ebuild
@@ -0,0 +1,19 @@
+# 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.11.7.ebuild b/virtual/dist-kernel/dist-kernel-5.11.7.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.11.7.ebuild
@@ -0,0 +1,19 @@
+# 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.106.ebuild b/virtual/dist-kernel/dist-kernel-5.4.106.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.106.ebuild
@@ -0,0 +1,19 @@
+# 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/imap-c-client/Manifest b/virtual/imap-c-client/Manifest
index 83d1cc259e53..2cb911cf8482 100644
--- a/virtual/imap-c-client/Manifest
+++ b/virtual/imap-c-client/Manifest
@@ -1,3 +1,2 @@
-EBUILD imap-c-client-1.ebuild 320 BLAKE2B 03af888ca6c6a3a7fded05b35bb1d1382e06ab3329f68994f1cbc6d9507fb392923f455d81558d15cf6ba0209c6aa28a280314c801577c32bcd56832c6e0c0ea SHA512 2295f28b1bdf9b1adc9cce43e1943633ae1295bb8b7aba806483e0ddd0a061a667ad9f50b7ceb43b9e1082ab18494fb6d6d9e2921792ff320b236a0517be9f1f
 EBUILD imap-c-client-2.ebuild 349 BLAKE2B 8049b1b176a9616c4dad883db152eac329f2ed25c03a35defda8d382df25324174946df7891cd17c3f44b75987fa3dbe31b08ec92f27c60bd928cebb7bf80a04 SHA512 ef2bd6036a164418dbd74fe6e81d93159e0e11cb97cba24e1c2cacea535304a32f6180033b9efd93d674c88b56acebff38987673d4ae9b803313b632e5969eac
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/virtual/imap-c-client/imap-c-client-1.ebuild b/virtual/imap-c-client/imap-c-client-1.ebuild
deleted file mode 100644
index 174e95c822f5..000000000000
--- a/virtual/imap-c-client/imap-c-client-1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for IMAP c-client"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="ssl"
-
-RDEPEND=" || (	net-libs/c-client[ssl=]
-				net-mail/uw-imap[ssl=] )"
diff --git a/virtual/mailx/Manifest b/virtual/mailx/Manifest
index 6e861a2543e6..db6609daee89 100644
--- a/virtual/mailx/Manifest
+++ b/virtual/mailx/Manifest
@@ -1,4 +1,2 @@
-EBUILD mailx-1.ebuild 371 BLAKE2B 0d2880cfc9ea4287d6a91ab4dede4646734d51b307caa366211d3dd7a712b72d757e346becc89821075fd1c9d4ff71f0dc29f051ec757bc4c986008c6d45c833 SHA512 2eb3254181005a722732813091a19ef6b532872c4a8033d7b0fcb95de0fa256a8a624ca5283015adc6445736e7d0d7b0d1b50b6290a4e1faaa2b34409ae75d93
-EBUILD mailx-2.ebuild 403 BLAKE2B 25e2155c6c1fcd215beaedf51d1cae79524bbeca10b364d11be07753f18a5be07eb2fe7cb5d7c8eb60b4c8b8a92a701bfeccc22065e5d9b70e7ccdf48f40eae6 SHA512 7bd9db8355957d67aee293fe2970eb1a84a1300fb166393ee853f5c4e9ae95d788250677b982e9095062e637134fbc5ad36e2dcb0ee08947c35211fc200c772a
-EBUILD mailx-3.ebuild 382 BLAKE2B 938d2a22062f5157f1754a4afa9f1b323455c8fd082db71b591538ddf7334509afb5399899c083ad82bea5a4c5912cb9e7aa079d1885e9ce836190e1970a030c SHA512 533f3baf1cad9c4777da63377434f66745ddbc94b0a695b905ba658d209c918f1b9a04063733f3525cc3272a411627237580ef80255a16a1a40a4ca0bb37080b
+EBUILD mailx-3.ebuild 373 BLAKE2B 8d41adb87642c2d8e1d0fca8ec4fc4e57a383edaadcc8485723ef7d0e2c1901ac20bc201ff44a890160c4043633d8d717a2f526a66ce3a1d252a140381462694 SHA512 06cdadd845ce2d5df96bee2b1105adee35643d4304ea8df92258bb05fe0deb3afdee74d05c175ab7a557a994f9d23e48007c56667adf309dd48b17cf89aaeb79
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/virtual/mailx/mailx-1.ebuild b/virtual/mailx/mailx-1.ebuild
deleted file mode 100644
index 2bc1190cbc83..000000000000
--- a/virtual/mailx/mailx-1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for mail implementations"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="|| (	net-mail/mailutils
-				mail-client/mailx
-				mail-client/nail )"
diff --git a/virtual/mailx/mailx-2.ebuild b/virtual/mailx/mailx-2.ebuild
deleted file mode 100644
index 9224959c73ec..000000000000
--- a/virtual/mailx/mailx-2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for mail implementations"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="|| (	net-mail/mailutils
-				mail-client/mailx
-				mail-client/s-nail
-				mail-client/nail )"
diff --git a/virtual/mailx/mailx-3.ebuild b/virtual/mailx/mailx-3.ebuild
index fae580487e68..9d78949e9569 100644
--- a/virtual/mailx/mailx-3.ebuild
+++ b/virtual/mailx/mailx-3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for mail implementations"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="|| (	net-mail/mailutils
 				mail-client/mailx
diff --git a/virtual/pager/Manifest b/virtual/pager/Manifest
index 8da074500e40..42a9574d222b 100644
--- a/virtual/pager/Manifest
+++ b/virtual/pager/Manifest
@@ -1,2 +1,2 @@
 EBUILD pager-0.ebuild 491 BLAKE2B 1f99f395f91fc1a7f9298497301125093916dd801e8eabd5602b30f6ef3380d2fe2c1bbb5324da3ac88952ceec1422d71d26d9f7653e54f82be1bff1b70c04cb SHA512 e75d28af7e4d98194c0e4abaf5a76c77daf4d6e21c85c9404a7a460c86a94440a50853a878f1e0f903847dc8b024924ff0dfd092edd33c6e685119c5a6af0dfe
-MISC metadata.xml 247 BLAKE2B e2d3dcf7f17d64fc457b247ba79d43e31c3b446330ec26728166349b84823d05f75bc70af5f20ba7cd31e456cd0e977d6238b9c2b6cd1af89b816187d2a40247 SHA512 e581fec6a7b875e7a7bb136407d5afc40ac04b2bdf8f9b12d559204416ed110e54a6295a301c07b24d971db46839beb405ac97cea966602af01cc2d6ccf5345e
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/virtual/pager/metadata.xml b/virtual/pager/metadata.xml
index c6dd702ff515..0319eec4c8be 100644
--- a/virtual/pager/metadata.xml
+++ b/virtual/pager/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type='person'>
+	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>