gentoo resync : 25.11.2020

75 files changed, 65 insertions, 479 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index cadb9f97f166..64518364a2c7 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/awk/Manifest b/virtual/awk/Manifest
index fd25e3fa1a14..2f8564c4aec0 100644
--- a/virtual/awk/Manifest
+++ b/virtual/awk/Manifest
@@ -1,2 +1,2 @@
-EBUILD awk-1.ebuild 466 BLAKE2B 3c180cce419f4cd09b4d8bce996ec4eaafcfec6ed138fcc97f9179607ac1ece6f6217bac6ea62c8c335c432d40b74732cd113d631ce4e4b8a2e383ea5e2c8774 SHA512 9b5975ee2c8a3ec282ef2b5cc0f535bc3f4d770765321951e7187bde22b3d834baac95b56bb5aa2cab53a9ff3f113d1ecc0b225158d695e4aba20b02a2363c13
+EBUILD awk-1.ebuild 473 BLAKE2B 62938a0fffc883bb74ca223dbd4862a85f62146255c09c8d90598b9e6157c7c64d9bcd2ac0f911aead6d91c94f50b67246f662726a43ec7c5b67fa27b6245ea8 SHA512 12e1665eefa09e34efd7eb1f8ee1f0c899e501334bd6283513539eb5f92fa91d0d010c77a09ecbabab0285070d358b8c4e2f5470e8bc6fe4b75468ed89f39310
 MISC metadata.xml 385 BLAKE2B d0c65503a8aec0e10e4412c3655df206935ea988ffc0f1285965c3bddb6fe84868f80a95b91612a3dcddc22ed6cb2d616d1e9f5fa294e70a3019a375db72763e SHA512 2e19654d5b258ca5e5737a5b59044d870a3b11211f4c4cd5eb92fd2ce1af8ae1082f04128d57efcd879055bfc223a7d32f5ddc3c0b933d9c0a6279aaa90f5833
diff --git a/virtual/awk/awk-1.ebuild b/virtual/awk/awk-1.ebuild
index 478d3848a79e..c405925c8a05 100644
--- a/virtual/awk/awk-1.ebuild
+++ b/virtual/awk/awk-1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Virtual for awk implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="
 	|| (
diff --git a/virtual/blas/Manifest b/virtual/blas/Manifest
index a39566399a06..ef2b712ebc36 100644
--- a/virtual/blas/Manifest
+++ b/virtual/blas/Manifest
@@ -1,5 +1,2 @@
-EBUILD blas-1.0.ebuild 418 BLAKE2B 06e6925626b426d8122cac589a641077f8a965a0702e407560667e2f0e4952f9884118e5609cffffcd23e475c2aeed80ab81129c8d401e7ea52570d8bf908c26 SHA512 124bb8aefb390c196c90b7fcd1d7bab79cd68fdaa3524900272bb38f0dcff50f47c96ff537bfdab0983c85e0d481cb199e4c1daed5b138c2b36a4b57fce21b43
-EBUILD blas-3.6.ebuild 415 BLAKE2B 79d32456f521e4b87414f847e0bdf3032634dcb1c0b010c57de9e427b775cd713dc6408d1d08c0beb6d96a90da398dcbd61c011e502fb4f15f35e040ef49eea1 SHA512 dceacfce30730e45460f4a66b02ecd14cd86829b375bc9d0db37f3fca869e86577f13f6654d955ca3333377b165ae7594217c5e1eb38cc9e4fa1b9460363a8cc
-EBUILD blas-3.7.ebuild 422 BLAKE2B ad004e317814cfa401671931a94bdda919dfc466bdfbcb5a250750784f5c8e488a1bddd9e277389699c8707c64d92c3c191952468b2a1306c7f2c7d21e9c9185 SHA512 86df4421344eb08cecc6d4d2deefc03467bec5f8fe64b9205eba04a8d536b1910795ccb45edf200d9d05866166eb5b0e956dff2c166319b5a87683ff18e6f882
 EBUILD blas-3.8.ebuild 549 BLAKE2B 06dead5e021fa2f7bc9079165b03c6e198eef6c767e602a653e5e7b3ae4f9f90f4091715d515930f4eb8eefbab766a412757b186b66fbc4b2f46affbe94783b3 SHA512 09a6e0a6bc1831692971b3c15397341da7f74b803cbfaf5f6c520f8c0adfc33c0547bad7cec7ea2383049a87f469a21674873375f0aec889d8462ba4dd616563
 MISC metadata.xml 372 BLAKE2B f086bfe8e6410f8f5c38331f77826de93bdfd5189af32978daec935504278ef630819a0faabf7c9eb951acc57b84d7a097b6f3cbc7cf1bc75ca49c07abe1f472 SHA512 133d87e8355cab8274a4a6c11f4d814fe0c33fa4cdce2c1ddcc63698da102bcffe5250b50da237554df1c678180a1da968407ef1a0fa24325654eb8ecf8994b8
diff --git a/virtual/blas/blas-1.0.ebuild b/virtual/blas/blas-1.0.ebuild
deleted file mode 100644
index 2494d82172f1..000000000000
--- a/virtual/blas/blas-1.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-
-RDEPEND="|| (
-		sci-libs/blas-reference
-		>=sci-libs/mkl-9.1.023
-		sci-libs/blas-goto
-	)"
diff --git a/virtual/blas/blas-3.6.ebuild b/virtual/blas/blas-3.6.ebuild
deleted file mode 100644
index cc82c6661572..000000000000
--- a/virtual/blas/blas-3.6.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-
-RDEPEND="|| (
-		>=sci-libs/blas-reference-20151113
-		>=sci-libs/mkl-9.1.023
-	)"
diff --git a/virtual/blas/blas-3.7.ebuild b/virtual/blas/blas-3.7.ebuild
deleted file mode 100644
index fc3320dbb07d..000000000000
--- a/virtual/blas/blas-3.7.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-
-RDEPEND="|| (
-		>=sci-libs/blas-reference-20161223
-		>=sci-libs/mkl-9.1.023
-	)"
diff --git a/virtual/cblas/Manifest b/virtual/cblas/Manifest
index 8b64d42655b9..0705275cab13 100644
--- a/virtual/cblas/Manifest
+++ b/virtual/cblas/Manifest
@@ -1,5 +1,2 @@
-EBUILD cblas-1.0.ebuild 394 BLAKE2B 0556a4b5f902902515ff58c15355cf482b81750169b57db9ada0372ae6e6c30c74003e508e51dd9bce7bccd0ebcd434f7fa738bdde864547d35ac4bcf3a9c5f7 SHA512 868e8c54404fe5d8a317819fcefe8b4769da359fb1792975d17f76a6003adc6b4f71a4bad851deb6a25918a4e1d73db10a03ab9be37b8592cf0b6ed6d691027e
-EBUILD cblas-3.6.ebuild 418 BLAKE2B 5968819e95f1b187abfbb054818cfd88a12780be9f6ceef1d2edf8591721ee335c4754fb75785c4c5d847d9eb3f2a37a6b41809b2f76f268b74fa6f6f42ac88e SHA512 6d2179dd02ec76dbef56e7a8d0cd9943af0de416f50f7665a37d9a952bfebf9f0769f0a4909c46c10268a6d08276abbc98d67c7f5e5056ef069bac76aaa66292
-EBUILD cblas-3.7.ebuild 425 BLAKE2B 4cdb0cfa43c386c30b8e6f2cdf1c189582dd704b958c40a6b991126960fcb086b8939eaa180c32f2440fd3da4f5e5e5c16c7dbe3a68f40d1c973750e6f3d6bb5 SHA512 68d26f2592b91eb2d4b5c18327d115bf23e98923d963a6c321d21327d8910e19f9ba2414b068963d98da65a0e6b8de589e9fef5db650b5001341f8f2c2cf9bed
 EBUILD cblas-3.8.ebuild 523 BLAKE2B 2a3b4feb622d7eda5e86f97c82d17e84ae52966be3799846f7e1064dcaa4f0b4a0df02bad447c0933de2843468ca0ee78c1a182435c4b6c94dcfbb770ea58749 SHA512 e71613e7fa60887d8b198a509e98644167a92ad31501835c68a15711a7b20970ed012663e2d3f703d9f522c97bc1c4f40412e41948a1a48b67b77fc6cd4d1061
 MISC metadata.xml 372 BLAKE2B f086bfe8e6410f8f5c38331f77826de93bdfd5189af32978daec935504278ef630819a0faabf7c9eb951acc57b84d7a097b6f3cbc7cf1bc75ca49c07abe1f472 SHA512 133d87e8355cab8274a4a6c11f4d814fe0c33fa4cdce2c1ddcc63698da102bcffe5250b50da237554df1c678180a1da968407ef1a0fa24325654eb8ecf8994b8
diff --git a/virtual/cblas/cblas-1.0.ebuild b/virtual/cblas/cblas-1.0.ebuild
deleted file mode 100644
index 18e1b899afbc..000000000000
--- a/virtual/cblas/cblas-1.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for BLAS C implementation"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="|| (
-		sci-libs/cblas-reference
-		sci-libs/gsl[-cblas-external]
-		>=sci-libs/mkl-9.1.023
-	)"
diff --git a/virtual/cblas/cblas-3.6.ebuild b/virtual/cblas/cblas-3.6.ebuild
deleted file mode 100644
index 70757a9dda21..000000000000
--- a/virtual/cblas/cblas-3.6.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual for BLAS C implementation"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="|| (
-		>=sci-libs/cblas-reference-20151113
-		sci-libs/gsl[-cblas-external]
-		>=sci-libs/mkl-9.1.023
-	)"
diff --git a/virtual/cblas/cblas-3.7.ebuild b/virtual/cblas/cblas-3.7.ebuild
deleted file mode 100644
index 5f160cad9a3e..000000000000
--- a/virtual/cblas/cblas-3.7.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual for BLAS C implementation"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="|| (
-		>=sci-libs/cblas-reference-20161223
-		sci-libs/gsl[-cblas-external]
-		>=sci-libs/mkl-9.1.023
-	)"
diff --git a/virtual/ffmpeg/Manifest b/virtual/ffmpeg/Manifest
deleted file mode 100644
index 3c4d90dba894..000000000000
--- a/virtual/ffmpeg/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD ffmpeg-9-r2.ebuild 830 BLAKE2B 7b33d6310b4af1fd005124c3be8b78b060c240656518226d9f3a648f6fe7ecbe2f3b73285ba4745aee900870446089d16f254d33a0d868d988d2a681d4599c31 SHA512 165da978d8dbbc828cd1b07fc89af449482dbae717bdb26a3e87c69e431b40272cc982d8f37a663d0268643731e4d791cd05f89cc8d09864df82302de7931a00
-MISC metadata.xml 316 BLAKE2B 478d0f4c19b80f9ba189da1580e09d0c28b7fe0c7c6d92f40a7ee0381b23d6f7a6cecd9f9d9b6f937e6329c01ee79b600f4e9da119ebd04c0b5132e641c0fa27 SHA512 ed51d4cd1e105acc8def63c22ef55fb52115f8cc7f3ffd8b7ad3bdc98d3509071e2c68f251eaa9dfe26d185fffd3851e20368ae6ba3933ddb099d6c01dd46cb7
diff --git a/virtual/ffmpeg/ffmpeg-9-r2.ebuild b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
deleted file mode 100644
index 2abb4da05dfc..000000000000
--- a/virtual/ffmpeg/ffmpeg-9-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual package for FFmpeg executable implementation"
-
-# Please note that this virtual is only suited for packages that call
-# ffmpeg/avconv or one of the remaining executables. If your package
-# links to one of the libraries, you need to use the following
-# dependency instead (adding IUSE=libav):
-#	libav? ( media-video/libav:0= )
-#	!libav? ( media-video/ffmpeg:0= )
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="X +encode gsm jpeg2k mp3 opus sdl speex theora threads truetype vaapi vdpau x264"
-
-RDEPEND="
-	>=media-video/ffmpeg-1.2.6-r1:0[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
-"
diff --git a/virtual/ffmpeg/metadata.xml b/virtual/ffmpeg/metadata.xml
deleted file mode 100644
index 9638faee4194..000000000000
--- a/virtual/ffmpeg/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>media-video@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name="opus">Use the external opus library for encoding and decoding.</flag>
-</use>
-</pkgmetadata>
diff --git a/virtual/jack/Manifest b/virtual/jack/Manifest
index ddfb8887aeb8..1fb163a07ef2 100644
--- a/virtual/jack/Manifest
+++ b/virtual/jack/Manifest
@@ -1,3 +1,2 @@
-EBUILD jack-0.ebuild 486 BLAKE2B 60967690c2ce1a6beaaaff9fbb62f7eff812afa4408d4909e6f8c1f4639411e95126cc2d96cfa905d84f541afdfa439025f92546bd5411e920b9fa13a4ef3998 SHA512 81f1440ed477f1786d3e6deb213943fec483b17075df8fa00be819ec8dafba20342cf3c8d87b38322c76a99696c6100fd828ce71a5c7321a2e9f82804e6d72ac
-EBUILD jack-1.ebuild 482 BLAKE2B 6868fea38dd58430b626db4db0ff99aa3f04f47b7d59e49f0be7ffc79c7a70fb80b54c33ba3fa173ca4a44534e48329bc7ca6aca4cd776fb9fce06342609cd93 SHA512 cff8355c23e1f395c2f58e232ad7c13432ec73d20960b57bf14d46fd90e9bf9fac90ecaa089e1d749a8a4116fea6c2dbca7942fc9dffd82afd74e6c79c02994c
+EBUILD jack-1.ebuild 462 BLAKE2B 9885ee3cb7c61bdd0f478bf3f459a4c156e6bac2dbc04d2ac53da0c682d202476c4a80f7b61be59cbc96de6dc27d51acf48eda09c3e19536c7c2392e9a7b999c SHA512 999ded297c04b6615d004dbbff3e109eb3efc6ef7167f767639aa1b8fbd2ba734c1254a00748f27c245982781f815220a8a9fdde5c1ab6199a67f9cbc3255f1a
 MISC metadata.xml 265 BLAKE2B e3dedcada43b8145986c6c9f3ed1d374d3e93d2a1f6bdf5d83af1a43e24d01ee0ea4b6efd67ffee46d585e6d37272cbacec69e66e21b22af6a5e01878003e44a SHA512 5b875b5d0a59914316df520eee72ee3c5f931b8513424120281657bbc266c777214a924e4c6c867cdd7a61cb66037c7b9b501225cc06d890abb8ca04c13f5fba
diff --git a/virtual/jack/jack-0.ebuild b/virtual/jack/jack-0.ebuild
deleted file mode 100644
index a97cf5a258b9..000000000000
--- a/virtual/jack/jack-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for JACK Audio Connection Kit"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-
-RDEPEND="
-	|| (
-		>=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}]
-		media-sound/jack2[${MULTILIB_USEDEP}]
-	)"
diff --git a/virtual/jack/jack-1.ebuild b/virtual/jack/jack-1.ebuild
index 8c4813bef27c..a229491a72ff 100644
--- a/virtual/jack/jack-1.ebuild
+++ b/virtual/jack/jack-1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for JACK Audio Connection Kit"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 arm arm64 ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/lapack/Manifest b/virtual/lapack/Manifest
index 838a99d081b7..6478b6d86f32 100644
--- a/virtual/lapack/Manifest
+++ b/virtual/lapack/Manifest
@@ -1,6 +1,2 @@
-EBUILD lapack-3.0.ebuild 333 BLAKE2B 88a1d115019e2daa742e2aae6df01e353b9ddba011c52300014d0f1911bc625abf3b7748018abf4bea1eb926509561d34ebb45f7f20e330a49eb632eccea1071 SHA512 6934566c2517fd756c99420a7ce388817727f0dab64e92796e3e292460bcedb86b73a743041b386e48924e44b28d863be445e8d1b278ddcc225c3590e8d6708e
-EBUILD lapack-3.1.ebuild 406 BLAKE2B 59dd90ee1c90b2a9758e6a59f3e370f8d00ebbd83b016e1de80c266935f2d0f420dc91b2446e7636fbe7a390f43b7a92194a36c05ebeff4c3846bd59b59a2f56 SHA512 fb7ad055ea2228cc26ded7a1a28a593ee2230ce180db6a13ccf9be0fa2a1d6948ddd913ae078b2ad616ebaf1c21f96316121b2047e6d7627142a7e6fd5d69881
-EBUILD lapack-3.6.ebuild 411 BLAKE2B e645fb35c0c4d292fcedbbceae29fcdf4a448c8e343e6d412faa57b1deab5c7d46a31ef695c17e6063c6b75f6e060bf7be4c337a9347dafebddc77c3c0bc4a99 SHA512 c243ac0fd76b22dd73d4ca634441260fdfae2069da94c371f6a238e2272ff68cbe76e79025613a70a1d2f5c9f7cd4049cad1a2bdc8609569fa3deb660fad2f82
-EBUILD lapack-3.7.ebuild 418 BLAKE2B 82e25aaaa91c9f0715dc8333e74592e3638c87741b6c3fe88b822da2bfb669eb1cb351af6de6fe56f38a61bc140abd6351dea1a532ef435be2cd280e420eacab SHA512 6a94d1cb5fe4feb155f5dab2b022bbda9c212c7ca6961be393958f0fa03e557e03873fce025d5688d7b8fe3d934ba26b09e518625429f17394b834bcaff9ec6f
 EBUILD lapack-3.8.ebuild 527 BLAKE2B f61f7f9ab9482b47da06c92ea0b86d687b94f75f61b3ef6d7978a87ddd1662c7e98065ddd95bcaf5aef459914be12d020f043e1df3a1801708f2e8e37e1969ca SHA512 3e69ef564d8a918360d144a185ad78d1f50855804e36e7a3858d801dacdd57438a457035aaa77397ce616d9c88d7071e95762ae603a45778409d305fb39c31a8
 MISC metadata.xml 372 BLAKE2B f086bfe8e6410f8f5c38331f77826de93bdfd5189af32978daec935504278ef630819a0faabf7c9eb951acc57b84d7a097b6f3cbc7cf1bc75ca49c07abe1f472 SHA512 133d87e8355cab8274a4a6c11f4d814fe0c33fa4cdce2c1ddcc63698da102bcffe5250b50da237554df1c678180a1da968407ef1a0fa24325654eb8ecf8994b8
diff --git a/virtual/lapack/lapack-3.0.ebuild b/virtual/lapack/lapack-3.0.ebuild
deleted file mode 100644
index cf0068683570..000000000000
--- a/virtual/lapack/lapack-3.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="|| (
-		sci-libs/lapack-reference
-		>=sci-libs/mkl-9.1.023
-	)"
diff --git a/virtual/lapack/lapack-3.1.ebuild b/virtual/lapack/lapack-3.1.ebuild
deleted file mode 100644
index 5b32c0b0f073..000000000000
--- a/virtual/lapack/lapack-3.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="|| (
-		>=sci-libs/lapack-reference-3.1
-		>=sci-libs/mkl-10
-	)"
diff --git a/virtual/lapack/lapack-3.6.ebuild b/virtual/lapack/lapack-3.6.ebuild
deleted file mode 100644
index dcbedcbb5a8d..000000000000
--- a/virtual/lapack/lapack-3.6.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="|| (
-		>=sci-libs/lapack-reference-3.6
-		>=sci-libs/mkl-10
-	)"
diff --git a/virtual/lapack/lapack-3.7.ebuild b/virtual/lapack/lapack-3.7.ebuild
deleted file mode 100644
index 71e4a65c06d0..000000000000
--- a/virtual/lapack/lapack-3.7.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 (LAPACK) implementation"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="|| (
-		>=sci-libs/lapack-reference-3.7
-		>=sci-libs/mkl-10
-	)"
diff --git a/virtual/lapacke/Manifest b/virtual/lapacke/Manifest
index ff8d040234ed..dfa2bd2593a2 100644
--- a/virtual/lapacke/Manifest
+++ b/virtual/lapacke/Manifest
@@ -1,2 +1,2 @@
-EBUILD lapacke-3.8.ebuild 409 BLAKE2B 5943ef2d3b23b00af456ce9dd4d9695bfa4c80387f5a7ff2c9cf5234b545e359aab4acbdfb895f4243429ac950c442c9afbbffbfb1d8e86b45bac6106cbbe0c2 SHA512 a11ea21b880921e1acd9cdcb2ba74b86547870bcf2c3518208733d01ea6a9d22157557add9f9a22db9f65c45e75a180b9ca0acd63c192fdf736e7625a3c2be3d
+EBUILD lapacke-3.8-r1.ebuild 524 BLAKE2B 740e10a3b96f69b50441e6a1e7b7af9ccde754322599a6f50578f1102f068f9724105abf75ede8d030fc446d515c136dd355ae423b763e60e2c83392f888da08 SHA512 64f77a21d58448ef3475a95cebade742199616e384870508550ee4f7cbafd1a961cb2d10d29513bf6b57ce0e2001fa562e4464496f952876bcadc03b70d93a28
 MISC metadata.xml 372 BLAKE2B f086bfe8e6410f8f5c38331f77826de93bdfd5189af32978daec935504278ef630819a0faabf7c9eb951acc57b84d7a097b6f3cbc7cf1bc75ca49c07abe1f472 SHA512 133d87e8355cab8274a4a6c11f4d814fe0c33fa4cdce2c1ddcc63698da102bcffe5250b50da237554df1c678180a1da968407ef1a0fa24325654eb8ecf8994b8
diff --git a/virtual/lapacke/lapacke-3.8-r1.ebuild b/virtual/lapacke/lapacke-3.8-r1.ebuild
new file mode 100644
index 000000000000..d5c1492a82f1
--- /dev/null
+++ b/virtual/lapacke/lapacke-3.8-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for LAPACK C implementation"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="eselect-ldso"
+
+RDEPEND="
+	>=sci-libs/lapack-3.8.0[lapacke,eselect-ldso?]
+	eselect-ldso? ( || (
+		>=sci-libs/lapack-3.8.0[lapacke,eselect-ldso]
+		>=sci-libs/openblas-0.3.10[eselect-ldso]
+	) )
+"
+DEPEND="${RDEPEND}"
diff --git a/virtual/lapacke/lapacke-3.8.ebuild b/virtual/lapacke/lapacke-3.8.ebuild
deleted file mode 100644
index 2d42bfde0920..000000000000
--- a/virtual/lapacke/lapacke-3.8.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for LAPACK C implementation"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="eselect-ldso"
-
-RDEPEND="
-	>=sci-libs/lapack-3.8.0[lapacke,eselect-ldso?]
-"
-DEPEND="${RDEPEND}"
diff --git a/virtual/leechcraft-browser/Manifest b/virtual/leechcraft-browser/Manifest
deleted file mode 100644
index e8ab7d6c65e6..000000000000
--- a/virtual/leechcraft-browser/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD leechcraft-browser-9999.ebuild 231 BLAKE2B 5554bd02ae05a31094116832c4e573727680f73133f92ca62def862d7532d898219415e24acf5729345c2282331a75a3069fc6d8e04fa6528a3be4594630fb9f SHA512 a930c6ac80b8351098f9fb23732461dae6fd8ff3482460e4f635f91c5a96225ba2db0952193dfb8ad7db0a5a7945fa756ffc0fe02575534786f9d1968e38a820
-MISC metadata.xml 364 BLAKE2B 39462072f9e35ecb19d9426fe032a499aefa12b7327ed4b97692f4a0778c9828f4b7cbef3bb5bb0bce597d51a99b11db8dabcaa9fda8a326c9916690e6ff4af4 SHA512 697d6e58b4620f4b3c1b7a147955d97f29815facb843de2b6cf67b0c44ccdcb6a0e47ae9a32947f0fccf6a3aea9d204bd30a334e642ff77acca43b03ff56f3bc
diff --git a/virtual/leechcraft-browser/leechcraft-browser-9999.ebuild b/virtual/leechcraft-browser/leechcraft-browser-9999.ebuild
deleted file mode 100644
index 6933ee0d1a3f..000000000000
--- a/virtual/leechcraft-browser/leechcraft-browser-9999.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for LeechCraft plugins providing a web browser"
-SLOT="0"
-
-RDEPEND="app-leechcraft/lc-poshuku"
diff --git a/virtual/leechcraft-browser/metadata.xml b/virtual/leechcraft-browser/metadata.xml
deleted file mode 100644
index ef43617d9e97..000000000000
--- a/virtual/leechcraft-browser/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>0xd34df00d@gmail.com</email>
-		<name>Georg Rudoy</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/leechcraft-downloader-http/Manifest b/virtual/leechcraft-downloader-http/Manifest
deleted file mode 100644
index 4c832bfbbb22..000000000000
--- a/virtual/leechcraft-downloader-http/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD leechcraft-downloader-http-9999.ebuild 238 BLAKE2B 9f114268e6b00b5fec7418b20f744a44531f40efe4553bed23c2581bbf80f7321a653f1531e13e597aafd9164835da6ba61eeac850560ee8c24573d3b13445b1 SHA512 1d635cf6b66a51a20f6b3fc0c4bbed1807c74d4da1c7bdd70115c905560171955b1a4f84e0ac0adc797344b0946983a69b9d7b8b1d721a66ffeb5cf7a2459437
-MISC metadata.xml 364 BLAKE2B 39462072f9e35ecb19d9426fe032a499aefa12b7327ed4b97692f4a0778c9828f4b7cbef3bb5bb0bce597d51a99b11db8dabcaa9fda8a326c9916690e6ff4af4 SHA512 697d6e58b4620f4b3c1b7a147955d97f29815facb843de2b6cf67b0c44ccdcb6a0e47ae9a32947f0fccf6a3aea9d204bd30a334e642ff77acca43b03ff56f3bc
diff --git a/virtual/leechcraft-downloader-http/leechcraft-downloader-http-9999.ebuild b/virtual/leechcraft-downloader-http/leechcraft-downloader-http-9999.ebuild
deleted file mode 100644
index 5ad30e6dad64..000000000000
--- a/virtual/leechcraft-downloader-http/leechcraft-downloader-http-9999.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for LeechCraft plugins providing HTTP downloading"
-SLOT="0"
-
-RDEPEND="~app-leechcraft/lc-cstp-${PV}"
diff --git a/virtual/leechcraft-downloader-http/metadata.xml b/virtual/leechcraft-downloader-http/metadata.xml
deleted file mode 100644
index ef43617d9e97..000000000000
--- a/virtual/leechcraft-downloader-http/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>0xd34df00d@gmail.com</email>
-		<name>Georg Rudoy</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/leechcraft-notifier/Manifest b/virtual/leechcraft-notifier/Manifest
deleted file mode 100644
index 7060e194a137..000000000000
--- a/virtual/leechcraft-notifier/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD leechcraft-notifier-9999.ebuild 303 BLAKE2B 9befaf536a8c9189798b3af802836d7020a4dc1c9ac878210ef465dd9ce50a31515a0e7cddee404dc099e76cfda0e26be5614d7305b7113a30e6c0c22d6b57a6 SHA512 99e6a9f742f84cd99c89d775aafef047c461003c4e7822282a4e76ceb478f8b6d592f4df752b05e37cd497d8233f28b51970ad21b91b610339fec2d57bc1973d
-MISC metadata.xml 364 BLAKE2B 39462072f9e35ecb19d9426fe032a499aefa12b7327ed4b97692f4a0778c9828f4b7cbef3bb5bb0bce597d51a99b11db8dabcaa9fda8a326c9916690e6ff4af4 SHA512 697d6e58b4620f4b3c1b7a147955d97f29815facb843de2b6cf67b0c44ccdcb6a0e47ae9a32947f0fccf6a3aea9d204bd30a334e642ff77acca43b03ff56f3bc
diff --git a/virtual/leechcraft-notifier/leechcraft-notifier-9999.ebuild b/virtual/leechcraft-notifier/leechcraft-notifier-9999.ebuild
deleted file mode 100644
index 4c2b75f1a756..000000000000
--- a/virtual/leechcraft-notifier/leechcraft-notifier-9999.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for LeechCraft plugins capable of visually notifying the user"
-SLOT="0"
-
-RDEPEND="|| (
-		~app-leechcraft/lc-kinotify-${PV}
-		~app-leechcraft/lc-dbusmanager-${PV}
-	)"
diff --git a/virtual/leechcraft-notifier/metadata.xml b/virtual/leechcraft-notifier/metadata.xml
deleted file mode 100644
index ef43617d9e97..000000000000
--- a/virtual/leechcraft-notifier/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>0xd34df00d@gmail.com</email>
-		<name>Georg Rudoy</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/leechcraft-quark-sideprovider/Manifest b/virtual/leechcraft-quark-sideprovider/Manifest
deleted file mode 100644
index 4ddba26424fe..000000000000
--- a/virtual/leechcraft-quark-sideprovider/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD leechcraft-quark-sideprovider-9999.ebuild 246 BLAKE2B 1e3a6622ffb3e5d364fd854ec5cbef6fd47653ad04dbaa8be30462e3cd8d24e3af98840638e03942b1d356e808dbac89e9128c048c4bdcadecae3953ddcfda27 SHA512 1ffd0fd143bb8c66604b639b4539a4050ac29e489d65c100c7cab7a584d8d7c1a06f1027c3257882d5e5f0e56af56a658717d4e1e7bec1c232f0ddb7d16a32fc
-MISC metadata.xml 364 BLAKE2B 39462072f9e35ecb19d9426fe032a499aefa12b7327ed4b97692f4a0778c9828f4b7cbef3bb5bb0bce597d51a99b11db8dabcaa9fda8a326c9916690e6ff4af4 SHA512 697d6e58b4620f4b3c1b7a147955d97f29815facb843de2b6cf67b0c44ccdcb6a0e47ae9a32947f0fccf6a3aea9d204bd30a334e642ff77acca43b03ff56f3bc
diff --git a/virtual/leechcraft-quark-sideprovider/leechcraft-quark-sideprovider-9999.ebuild b/virtual/leechcraft-quark-sideprovider/leechcraft-quark-sideprovider-9999.ebuild
deleted file mode 100644
index 5d1255265347..000000000000
--- a/virtual/leechcraft-quark-sideprovider/leechcraft-quark-sideprovider-9999.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for LeechCraft plugins displaying quarks near window edges"
-SLOT="0"
-
-RDEPEND="~app-leechcraft/lc-sb2-${PV}"
diff --git a/virtual/leechcraft-quark-sideprovider/metadata.xml b/virtual/leechcraft-quark-sideprovider/metadata.xml
deleted file mode 100644
index ef43617d9e97..000000000000
--- a/virtual/leechcraft-quark-sideprovider/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>0xd34df00d@gmail.com</email>
-		<name>Georg Rudoy</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/leechcraft-search-show/Manifest b/virtual/leechcraft-search-show/Manifest
deleted file mode 100644
index dceebf949d93..000000000000
--- a/virtual/leechcraft-search-show/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD leechcraft-search-show-9999.ebuild 246 BLAKE2B ced20f2a2b8e83727b601e031aadc7409b2043f43377559ff6e869738a6b2bb0bc0fe31bd9bf84e5f031bc780c7c93b1ce2664c559bb55075f489aad7fc614f1 SHA512 f20394111ca3155dd2c80bd4e918762e6f06e846505446aae0beab423db19ea2772ca445bd82d5952868e247b38943d350626f972d1a2a66dd8c549459b85c85
-MISC metadata.xml 364 BLAKE2B 39462072f9e35ecb19d9426fe032a499aefa12b7327ed4b97692f4a0778c9828f4b7cbef3bb5bb0bce597d51a99b11db8dabcaa9fda8a326c9916690e6ff4af4 SHA512 697d6e58b4620f4b3c1b7a147955d97f29815facb843de2b6cf67b0c44ccdcb6a0e47ae9a32947f0fccf6a3aea9d204bd30a334e642ff77acca43b03ff56f3bc
diff --git a/virtual/leechcraft-search-show/leechcraft-search-show-9999.ebuild b/virtual/leechcraft-search-show/leechcraft-search-show-9999.ebuild
deleted file mode 100644
index 307786629b93..000000000000
--- a/virtual/leechcraft-search-show/leechcraft-search-show-9999.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for LeechCraft plugins providing UI for search plugins"
-SLOT="0"
-
-RDEPEND="~app-leechcraft/lc-summary-${PV}"
diff --git a/virtual/leechcraft-search-show/metadata.xml b/virtual/leechcraft-search-show/metadata.xml
deleted file mode 100644
index ef43617d9e97..000000000000
--- a/virtual/leechcraft-search-show/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>0xd34df00d@gmail.com</email>
-		<name>Georg Rudoy</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/leechcraft-storage-device-manager/Manifest b/virtual/leechcraft-storage-device-manager/Manifest
deleted file mode 100644
index 4df364a03cfe..000000000000
--- a/virtual/leechcraft-storage-device-manager/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD leechcraft-storage-device-manager-9999.ebuild 245 BLAKE2B 4d110ce04b99b00ca026a31c5cec70b31cdf7278572b03404de31254d37dce71768c9b8169eb197ad07795eea1c761876b8634e7ecd50da2eb70966e46f4ff43 SHA512 60a6054d4110c84009c42c9d4d0ae2d995d963172007959d864677c98c460f78d766c46dd8f0b32464afce00e62945821340a04314343193732a1e928e08e2e5
-MISC metadata.xml 364 BLAKE2B 39462072f9e35ecb19d9426fe032a499aefa12b7327ed4b97692f4a0778c9828f4b7cbef3bb5bb0bce597d51a99b11db8dabcaa9fda8a326c9916690e6ff4af4 SHA512 697d6e58b4620f4b3c1b7a147955d97f29815facb843de2b6cf67b0c44ccdcb6a0e47ae9a32947f0fccf6a3aea9d204bd30a334e642ff77acca43b03ff56f3bc
diff --git a/virtual/leechcraft-storage-device-manager/leechcraft-storage-device-manager-9999.ebuild b/virtual/leechcraft-storage-device-manager/leechcraft-storage-device-manager-9999.ebuild
deleted file mode 100644
index ca3737218170..000000000000
--- a/virtual/leechcraft-storage-device-manager/leechcraft-storage-device-manager-9999.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for LeechCraft plugins for managing removable storage devices"
-SLOT="0"
-
-RDEPEND="app-leechcraft/lc-vrooby"
diff --git a/virtual/leechcraft-storage-device-manager/metadata.xml b/virtual/leechcraft-storage-device-manager/metadata.xml
deleted file mode 100644
index ef43617d9e97..000000000000
--- a/virtual/leechcraft-storage-device-manager/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>0xd34df00d@gmail.com</email>
-		<name>Georg Rudoy</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/leechcraft-task-show/Manifest b/virtual/leechcraft-task-show/Manifest
deleted file mode 100644
index 01b6ce845e97..000000000000
--- a/virtual/leechcraft-task-show/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD leechcraft-task-show-9999.ebuild 244 BLAKE2B a199ea34828783e7857773734b6820e1f2967b0b22b033e13f95996045d586d04a72cc57b7dbaf5d106fabed66c3ad2b1506b8d6136434a6aa9c3b41a6980f9d SHA512 55564f1e3a312482e513b01333f58bc88896d5c6113408c42cac5b31b502a302a8481b93579120d72756dd9bf2f87aa38eb642bd210f9aaece69d61156c23663
-MISC metadata.xml 364 BLAKE2B 39462072f9e35ecb19d9426fe032a499aefa12b7327ed4b97692f4a0778c9828f4b7cbef3bb5bb0bce597d51a99b11db8dabcaa9fda8a326c9916690e6ff4af4 SHA512 697d6e58b4620f4b3c1b7a147955d97f29815facb843de2b6cf67b0c44ccdcb6a0e47ae9a32947f0fccf6a3aea9d204bd30a334e642ff77acca43b03ff56f3bc
diff --git a/virtual/leechcraft-task-show/leechcraft-task-show-9999.ebuild b/virtual/leechcraft-task-show/leechcraft-task-show-9999.ebuild
deleted file mode 100644
index 7883a22c43e7..000000000000
--- a/virtual/leechcraft-task-show/leechcraft-task-show-9999.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for plugins that can show IDownloads and IJobHolders"
-SLOT="0"
-
-RDEPEND="~app-leechcraft/lc-summary-${PV}"
diff --git a/virtual/leechcraft-task-show/metadata.xml b/virtual/leechcraft-task-show/metadata.xml
deleted file mode 100644
index ef43617d9e97..000000000000
--- a/virtual/leechcraft-task-show/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>0xd34df00d@gmail.com</email>
-		<name>Georg Rudoy</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/leechcraft-trayarea/Manifest b/virtual/leechcraft-trayarea/Manifest
deleted file mode 100644
index 1a7336bd41d4..000000000000
--- a/virtual/leechcraft-trayarea/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD leechcraft-trayarea-9999.ebuild 232 BLAKE2B 030a5c40d07bbd0c93dd5239d1b5a3644ffecb12a2c02c79a0faddbaf942b029fb22f8d15dc586d6d7537bcddd0c16bd9a5ced238a82e2e4559706a63b01d661 SHA512 13270e009ba41b9a5e3609f40ba0975272414c6ec237cc1e59b00f01c31c5f54c6693fedb92de7d816ffcd646a129a45124e405490274ba4995b0c351d5aa73c
-MISC metadata.xml 364 BLAKE2B 39462072f9e35ecb19d9426fe032a499aefa12b7327ed4b97692f4a0778c9828f4b7cbef3bb5bb0bce597d51a99b11db8dabcaa9fda8a326c9916690e6ff4af4 SHA512 697d6e58b4620f4b3c1b7a147955d97f29815facb843de2b6cf67b0c44ccdcb6a0e47ae9a32947f0fccf6a3aea9d204bd30a334e642ff77acca43b03ff56f3bc
diff --git a/virtual/leechcraft-trayarea/leechcraft-trayarea-9999.ebuild b/virtual/leechcraft-trayarea/leechcraft-trayarea-9999.ebuild
deleted file mode 100644
index 9e22e5133207..000000000000
--- a/virtual/leechcraft-trayarea/leechcraft-trayarea-9999.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for LeechCraft plugins providing a tray area"
-SLOT="0"
-
-RDEPEND="~app-leechcraft/lc-sb2-${PV}"
diff --git a/virtual/leechcraft-trayarea/metadata.xml b/virtual/leechcraft-trayarea/metadata.xml
deleted file mode 100644
index ef43617d9e97..000000000000
--- a/virtual/leechcraft-trayarea/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>0xd34df00d@gmail.com</email>
-		<name>Georg Rudoy</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/leechcraft-wysiwyg-editor/Manifest b/virtual/leechcraft-wysiwyg-editor/Manifest
deleted file mode 100644
index 09f7c03fa5b2..000000000000
--- a/virtual/leechcraft-wysiwyg-editor/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD leechcraft-wysiwyg-editor-9999.ebuild 241 BLAKE2B 07758d5387cab4f605233e999a712beaca0df2982289860d54de869b2efb18e7578c1a9c4fed8bd5e99cb39cd0af83f7013883c8c1d51e97451ba60ca00f68e9 SHA512 2ab8d20a4bad8769d98d2f70a1735d0e017ee67aea0639c493cbce52f764d84d771b41a17b97af71fdbcb7276809faf8d7c6182dd56180b9e4a94a3d8b8bd3dd
-MISC metadata.xml 364 BLAKE2B 39462072f9e35ecb19d9426fe032a499aefa12b7327ed4b97692f4a0778c9828f4b7cbef3bb5bb0bce597d51a99b11db8dabcaa9fda8a326c9916690e6ff4af4 SHA512 697d6e58b4620f4b3c1b7a147955d97f29815facb843de2b6cf67b0c44ccdcb6a0e47ae9a32947f0fccf6a3aea9d204bd30a334e642ff77acca43b03ff56f3bc
diff --git a/virtual/leechcraft-wysiwyg-editor/leechcraft-wysiwyg-editor-9999.ebuild b/virtual/leechcraft-wysiwyg-editor/leechcraft-wysiwyg-editor-9999.ebuild
deleted file mode 100644
index ea4897bdd92a..000000000000
--- a/virtual/leechcraft-wysiwyg-editor/leechcraft-wysiwyg-editor-9999.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for LeechCraft plugins providing WYSIWYG text editor"
-SLOT="0"
-
-RDEPEND="~app-leechcraft/lc-lhtr-${PV}"
diff --git a/virtual/leechcraft-wysiwyg-editor/metadata.xml b/virtual/leechcraft-wysiwyg-editor/metadata.xml
deleted file mode 100644
index ef43617d9e97..000000000000
--- a/virtual/leechcraft-wysiwyg-editor/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>0xd34df00d@gmail.com</email>
-		<name>Georg Rudoy</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/libc/Manifest b/virtual/libc/Manifest
index 1983acd953f7..e8fc40709552 100644
--- a/virtual/libc/Manifest
+++ b/virtual/libc/Manifest
@@ -1,2 +1,2 @@
-EBUILD libc-1-r1.ebuild 816 BLAKE2B c4be5ea3e376d3e3993a4cffcfb4062602a13731c751dc40e400ffcc86e4eed512141be2e876c9b28c3cf0c50e7ec94504265e8350287b0dd4733b7266ae1311 SHA512 f8b71845663ea9b746320d1f2c25b7eb2d1a387f237544396546a4d1c1f7b11aee5dd201122491c71a723b75d641d9fcfc87c3a883c98fddbe815dee392baa67
+EBUILD libc-1-r1.ebuild 797 BLAKE2B c0f43db922154d4f2485c0612201f329a99399a04fd377a37166c73166f34c98d7efc4a6de2f62c48bf3e68acd28978027e73c893158675ed50652658086e263 SHA512 23c04265fa51cd930ee7deae9fa365a8cae1c206bd5c794cb542cdb2ebd69916a74cc741a0cceb829ec13ee8dc402ccbe348640a9c5ef202c15f4fd7c162c5ad
 MISC metadata.xml 365 BLAKE2B 5a045bfed52c49ec0cfe074512001e5ab3aea429bb6211812c2c4ac0b91acc4831613141e750827b1f56b8c9c69cf6970317a9ed0ae23ecab0bca8daccd26a24 SHA512 b4b656f72037c54182557618adb9a8f5da16f1a0e0b8fda545a760e5500d9b8b52b78084f16c0cf6c2cbe58d8aa577550e4423cf28d10b6edc7f4027efc1eeb0
diff --git a/virtual/libc/libc-1-r1.ebuild b/virtual/libc/libc-1-r1.ebuild
index 8b62a9abad0e..bc756de65270 100644
--- a/virtual/libc/libc-1-r1.ebuild
+++ b/virtual/libc/libc-1-r1.ebuild
@@ -20,5 +20,4 @@ RDEPEND="!prefix-guest? (
 		!sys-libs/glibc
 		!sys-libs/musl
 		!sys-libs/uclibc-ng
-		!sys-libs/uclibc
 	)"
diff --git a/virtual/libusb/Manifest b/virtual/libusb/Manifest
index 98f03a411bd8..1f394f669af7 100644
--- a/virtual/libusb/Manifest
+++ b/virtual/libusb/Manifest
@@ -1,4 +1,4 @@
 EBUILD libusb-0-r2.ebuild 382 BLAKE2B ef63b79fc89b4f2e5b2d7417a7eeced5e53613fbd67058ff51290e5bdfb3ffd094dcc44c3411224e2441aeec378b45d1a2fde3bbb27052053cc1266eddbd307e SHA512 05724d4dd0a1cd5066308cca24b1130dc8509a77fdd47943e3a54e11d1f05099abf0c4833c8dba7744210d5ef38ce7498856e1563c2cb4e21c4737edf057ed77
 EBUILD libusb-1-r1.ebuild 398 BLAKE2B b25809708647dcce8765a13b5bf222be2fc40e1a33e7637e9aac3eb701ffbd706e41a65dd7135baf44c1a2898276fdfb1fc842604c43e573e1d3667a6f2eb319 SHA512 45e0fad6b24b0da1a3d948ce0353689fec65705aff758efcfe8c1bb6c2152d859c37a66797a513f9fc53ddc38fd4c8a7620d5ba8c80afca16d55a53821ec1b8e
-EBUILD libusb-1-r2.ebuild 554 BLAKE2B 2e56cf3612866c33d8f2b5a642373955adf17213fdbf3df6bf2a586b3d0e65252e37e520da55ac1d008b40550a61a8df580ad07975a8fe584406459f6a0ab9f0 SHA512 8306bc71b0d003bb3cef9d079a7b45c4fbfd2af221aafc9e1fdf16d5e795986493bd2d60d85c06ba3434971c87a04546fc24d85460e1c6c5200cbca57cb4c227
+EBUILD libusb-1-r2.ebuild 552 BLAKE2B 6fcc098d9a2afc21e289939ceb19836429aa022c9c2927c59ad09a3239b03c14c7293694c2c8169bebf3f89916fe875fc872cd6e2039efe8010f72e1848d4b38 SHA512 12fbf9c13ea99b28f967f55f9f01bd5858da354eba0d576c29f5bdf27bd548b1ed61a679e027e22e6a968decb58c1cbb083b0586f95668c9c0128e74aa00e570
 MISC metadata.xml 258 BLAKE2B a6fcc3580b114ca2b15b760b7e31af88ff854dbfe58715bdf35264771f6aa99f96eadbbb91d005905bf255f26e75d3b0a16ff9c04085c41d7466aaa4b11b90f7 SHA512 e1a07b8724003615826aa66143a03801309fd54fcc2a0f23075c13ca61d4ed35f1d105ea2b447845e2a3d917a84fa81f4f1d1cab6ba3b8d7f7e0ea025387ddf1
diff --git a/virtual/libusb/libusb-1-r2.ebuild b/virtual/libusb/libusb-1-r2.ebuild
index 2522db44a912..469adccdbc75 100644
--- a/virtual/libusb/libusb-1-r2.ebuild
+++ b/virtual/libusb/libusb-1-r2.ebuild
@@ -6,7 +6,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libusb"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="udev"
 
 # We force a recent libusb so that downstream consumers of virtual/libusb
diff --git a/virtual/mpi/Manifest b/virtual/mpi/Manifest
index ea64b1414e67..496101141e84 100644
--- a/virtual/mpi/Manifest
+++ b/virtual/mpi/Manifest
@@ -1,4 +1,4 @@
-EBUILD mpi-2.0-r3.ebuild 555 BLAKE2B 59591f899827a857a2db548091fbd775b5066bb987f4ce887c05550a39e47fc1284ab8d65f0fbd334ca50c115a3abc5cc3a64a20ed51abfb5948d6bc9f54d446 SHA512 180cc6d7db6df7b922f3d6eaf2454c9be5a3dadbf0df672f3911e0cca559916cba1c1a21b8f907dce6d7a08b973dafe1ac04856276f5ec7204cc88372d1b0453
-EBUILD mpi-2.0-r4.ebuild 784 BLAKE2B 026afcf2efbcee7a1ce1caac22e62676df1f669999f804c6310f49eff244699b1fa04806be1978c746104e5db562d430ff8aa03acdfb4fd150c109a63ed7151d SHA512 156112dac636bf6950e48a27d0914b46ca5fd2cee583637e01cc47f1f01ead007db8a21c3e255da4b0027cb9420afdcf356c815ca0349b508afc5af136ed2ddc
-EBUILD mpi-2.0-r5.ebuild 791 BLAKE2B 22beb1769225afea890e93fc6c012334ca5336bafc9a1c44372529d77220b0747f4ddbe52c662e5bb3785601e6b2b7db1ce0fe2a5bdb0577d65ae6c4edbf50c3 SHA512 171ba1aab56e1558c2c0d4db4c2cd798b9edd44ccb1b5e2f191196e109af4e37519528734cb3a237c17db4b964f7e2b6a1a405f91b79b8fa9b6b601607852fdd
+EBUILD mpi-2.0-r3.ebuild 507 BLAKE2B 8b76f3e1b8db535b17a2e9c9f63a7169164b75fda181d6386d3d450289edb5a20b735878d81a4f3ddddbc210a1ec89709eb923ac67014d5be983a6cd21e72626 SHA512 ce56207420d082b069caebe92b48ffc9fc5b95b53fee1ab60967de065eb949929f01503751401edcc5cfefbf780c51ec047935a06e825da2f65b68b29d355078
+EBUILD mpi-2.0-r4.ebuild 706 BLAKE2B 5fb568836a65dfe1a051e265951956d3a3af2f0cb569c78692c4b84413340f748a8cb00badebc9a615fa93c9d877513ccc6d4a9595a5f06d46b24d03cf116fcf SHA512 e3f721e6f7e6e55f3fc7d804022e81eb0b96cb6316fe0cdd93bb673d55799ea4b5b00de7d6167728c8fa556350d47d3cf5a9aafd6eb6767afa05087162910880
+EBUILD mpi-2.0-r5.ebuild 713 BLAKE2B 3451826db5d294c1daa48147a9295e5731aab52b28af7bf5b9e989a7d2c11ea92e477e49e72d2a8f40b303e03a4149a6beefa87e8b5474d735f293b7dbdeca5d SHA512 d8eae0c7108adfb883de880a435eb364b3a7b3a02d95000847c68cc36b4d975c937be8b6b5685841f684cc0af7487e52024f9cfe70417f5423b787e972a46fe8
 MISC metadata.xml 349 BLAKE2B 0ade9eae1d3c1860a3004f17b1136326c7c160ea7c21410f3fd5af0362500350f6e1667ac8316bf4e4e5b11c50f29dd65e91e2957054f590cbf2fc453f96d059 SHA512 396d35d2c66059fa0448f3df7c2d62829b7658319abc76c7555193d45395ee39de5169a8dda71a7750f2b7550cd4f02618404fa982eec165fcba85efcfbdd10b
diff --git a/virtual/mpi/mpi-2.0-r3.ebuild b/virtual/mpi/mpi-2.0-r3.ebuild
index a418eb7f8a8d..4e53e418c930 100644
--- a/virtual/mpi/mpi-2.0-r3.ebuild
+++ b/virtual/mpi/mpi-2.0-r3.ebuild
@@ -12,6 +12,5 @@ RDEPEND="|| (
 	sys-cluster/openmpi[cxx?,fortran?,romio?,threads?]
 	sys-cluster/mpich[cxx?,fortran?,romio?,threads?]
 	sys-cluster/mpich2[cxx?,fortran?,romio?,threads?]
-	sys-cluster/mvapich2[fortran?,romio?,threads?]
 	sys-cluster/native-mpi
 )"
diff --git a/virtual/mpi/mpi-2.0-r4.ebuild b/virtual/mpi/mpi-2.0-r4.ebuild
index 8c62f8c886c0..3e2f22f0ba26 100644
--- a/virtual/mpi/mpi-2.0-r4.ebuild
+++ b/virtual/mpi/mpi-2.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,6 @@ RDEPEND="|| (
 	>=sys-cluster/openmpi-1.10.2-r1[${MULTILIB_USEDEP},cxx?,fortran?,romio?,threads?]
 	>=sys-cluster/mpich-3.2-r1[${MULTILIB_USEDEP},cxx?,fortran?,romio?,threads?]
 	sys-cluster/mpich2[${MULTILIB_USEDEP},cxx?,fortran?,romio?,threads?]
-	sys-cluster/mvapich2[${MULTILIB_USEDEP},cxx(-)?,fortran?,romio?,threads?]
 	sys-cluster/nullmpi[${MULTILIB_USEDEP},cxx(-)?,fortran(-)?,romio(-)?,threads(-)?]
 	sys-cluster/native-mpi
 )"
diff --git a/virtual/mpi/mpi-2.0-r5.ebuild b/virtual/mpi/mpi-2.0-r5.ebuild
index 859edf5a2f76..c6ef070ea825 100644
--- a/virtual/mpi/mpi-2.0-r5.ebuild
+++ b/virtual/mpi/mpi-2.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,6 @@ RDEPEND="|| (
 	>=sys-cluster/openmpi-1.10.2-r1[${MULTILIB_USEDEP},cxx?,fortran?,romio?,threads(+)?]
 	>=sys-cluster/mpich-3.2-r1[${MULTILIB_USEDEP},cxx?,fortran?,romio?,threads?]
 	sys-cluster/mpich2[${MULTILIB_USEDEP},cxx?,fortran?,romio?,threads?]
-	sys-cluster/mvapich2[${MULTILIB_USEDEP},cxx(-)?,fortran?,romio?,threads?]
 	sys-cluster/nullmpi[${MULTILIB_USEDEP},cxx(-)?,fortran(-)?,romio(-)?,threads(-)?]
 	sys-cluster/native-mpi
 )"
diff --git a/virtual/mysql/Manifest b/virtual/mysql/Manifest
index f7175911c8d0..4418815f605c 100644
--- a/virtual/mysql/Manifest
+++ b/virtual/mysql/Manifest
@@ -1,3 +1,2 @@
-EBUILD mysql-5.5-r2.ebuild 529 BLAKE2B 1ae61b812134823c051a53332a2680410efb6ec85ea813c7be107c833ba0146647be50e1c3720f77d13d8a5bb26364e8f8938b2cc3f3407714b8060a7c2ccd13 SHA512 1f1344fe4c6550d8158f7d4e1b17d24fe8e4ed60d28a319f60fcdcf0e64b8754a8055086ea0dbec94e73ff21f75d3e76f47ff8265c2f2aeea57ed07cb59a10f2
 EBUILD mysql-5.6-r13.ebuild 678 BLAKE2B 85ce224ebcb8f47484e1b2be2ff10a704c72cd34c9a5fa506a477a8606b2325fafcbbf18ac284c9a160590e806ff31cbf0c1c9aad758b7f06a34e800445b4dea SHA512 35e65db2e38678e75a4bb5455ef5eadc80f9ebba0093dc04382c50de72a1f954bcf7c7ca3de03d3ea34ec84141deaf00fe621132df6a1e7dace852a5b87b8c7b
 MISC metadata.xml 386 BLAKE2B cc1e000793240edd0df36c1b83d13c8806ac631fc5d476d574aad80d347b5d37f3e5c46be124ee6ab9b6061e05bf78340625ddf75857c9ea4d32019334c23405 SHA512 76ecdfbd7f00cc8ec96d0c8d98bf88b843bc51b77a12869dbbc778517d1d4dd95ae01cfe56718a0fdef74a111ff20d64154d53470cfae836493215c031504451
diff --git a/virtual/mysql/mysql-5.5-r2.ebuild b/virtual/mysql/mysql-5.5-r2.ebuild
deleted file mode 100644
index 0c529acfa516..000000000000
--- a/virtual/mysql/mysql-5.5-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual for MySQL client or database"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="static static-libs"
-
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[static?,static-libs(-)?]
-	=dev-db/mysql-${PV}*[static?,static-libs(-)?]
-	=dev-db/mysql-cluster-7.2*[static?,static-libs(-)?]
-)"
diff --git a/virtual/qmail/Manifest b/virtual/qmail/Manifest
index 3d84a75ec7b6..d5d32c4a340a 100644
--- a/virtual/qmail/Manifest
+++ b/virtual/qmail/Manifest
@@ -1,2 +1,2 @@
-EBUILD qmail-1.03.ebuild 307 BLAKE2B 3ccce67d65633faa9449a1e2aea3723fcb806435ee3742acf41742767a0dfb8711ecb8401dbdd8de648cca021ee48a2e99b93e3882b6428462f258c6871b7ff3 SHA512 62ef067b6c67656e8af00ee724ea833c8e41175219fb25c9946121390b01e48108cf8b34d5e09d49d934fed9c6a8d484e4cac78fa25ea597e1660d7ec602eb6d
+EBUILD qmail-1.03.ebuild 314 BLAKE2B cb895ed992b7e91c0a38e1c11fd15bd992c8047ed783a18289a1b00bac5765ce0f603c552f4f1b20065d17c5e39b63e4daacd7b07d1ab3398b5e04a30c134888 SHA512 99cc9bf078bfd0f424eb975d8cc534d23cca5cbcd8bbefd6f7351b7f14ee150997df471e4bfdb786e559fa82b7c5204fee9b02b296fd3f353a9b15a3661b5f68
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/virtual/qmail/qmail-1.03.ebuild b/virtual/qmail/qmail-1.03.ebuild
index 5e0f770f84a5..26e526392859 100644
--- a/virtual/qmail/qmail-1.03.ebuild
+++ b/virtual/qmail/qmail-1.03.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for qmail"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="|| (
 	mail-mta/netqmail
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 552c8e5267f9..22f9b53a41db 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,4 +1,5 @@
-EBUILD rust-1.44.1.ebuild 359 BLAKE2B bdf5cf7593eeb2712785ee42ffc53ea60db682591cf9f1d50a1a79dfad0295ca7432ccddc3a42b2070e4ad757786ad72788088f585fbb4a791780dca5bcf724e SHA512 45d2e5b01c193150ce67e9bf03c7792ca41d2d8c888fb344e50abc45c8a2746105421bb98bf5e610ec24386a6b00d2767fa59bcd445968dec0b6745b1ae0ea79
 EBUILD rust-1.45.2.ebuild 359 BLAKE2B bdf5cf7593eeb2712785ee42ffc53ea60db682591cf9f1d50a1a79dfad0295ca7432ccddc3a42b2070e4ad757786ad72788088f585fbb4a791780dca5bcf724e SHA512 45d2e5b01c193150ce67e9bf03c7792ca41d2d8c888fb344e50abc45c8a2746105421bb98bf5e610ec24386a6b00d2767fa59bcd445968dec0b6745b1ae0ea79
-EBUILD rust-1.46.0.ebuild 364 BLAKE2B abd8065706713d741bfc63e7f7f1e7b2f2e1119c38bead9fcd7aefb4777b371b6685790dc2962bf5b8f36b4a167fc51b1ae21ffdf379e69a3b4e216b1a0ee910 SHA512 59607c4c32ae7db32be5e77912f109beb28f3fe8ed0adee814bc1949301ed3376cbecd69dbbc2554b6ccfd4142177381af659c3a0e861d6255f079ecbcb419fa
+EBUILD rust-1.46.0.ebuild 359 BLAKE2B bdf5cf7593eeb2712785ee42ffc53ea60db682591cf9f1d50a1a79dfad0295ca7432ccddc3a42b2070e4ad757786ad72788088f585fbb4a791780dca5bcf724e SHA512 45d2e5b01c193150ce67e9bf03c7792ca41d2d8c888fb344e50abc45c8a2746105421bb98bf5e610ec24386a6b00d2767fa59bcd445968dec0b6745b1ae0ea79
+EBUILD rust-1.47.0.ebuild 364 BLAKE2B abd8065706713d741bfc63e7f7f1e7b2f2e1119c38bead9fcd7aefb4777b371b6685790dc2962bf5b8f36b4a167fc51b1ae21ffdf379e69a3b4e216b1a0ee910 SHA512 59607c4c32ae7db32be5e77912f109beb28f3fe8ed0adee814bc1949301ed3376cbecd69dbbc2554b6ccfd4142177381af659c3a0e861d6255f079ecbcb419fa
+EBUILD rust-1.48.0.ebuild 364 BLAKE2B abd8065706713d741bfc63e7f7f1e7b2f2e1119c38bead9fcd7aefb4777b371b6685790dc2962bf5b8f36b4a167fc51b1ae21ffdf379e69a3b4e216b1a0ee910 SHA512 59607c4c32ae7db32be5e77912f109beb28f3fe8ed0adee814bc1949301ed3376cbecd69dbbc2554b6ccfd4142177381af659c3a0e861d6255f079ecbcb419fa
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/rust-1.46.0.ebuild b/virtual/rust/rust-1.46.0.ebuild
index 7cf8d65440f8..6f32b771ca56 100644
--- a/virtual/rust/rust-1.46.0.ebuild
+++ b/virtual/rust/rust-1.46.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Virtual for Rust language compiler"
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 
 BDEPEND=""
 RDEPEND="|| ( ~dev-lang/rust-${PV}[${MULTILIB_USEDEP}] ~dev-lang/rust-bin-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/virtual/rust/rust-1.44.1.ebuild b/virtual/rust/rust-1.47.0.ebuild
index 6f32b771ca56..7cf8d65440f8 100644
--- a/virtual/rust/rust-1.44.1.ebuild
+++ b/virtual/rust/rust-1.47.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Virtual for Rust language compiler"
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 BDEPEND=""
 RDEPEND="|| ( ~dev-lang/rust-${PV}[${MULTILIB_USEDEP}] ~dev-lang/rust-bin-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/virtual/rust/rust-1.48.0.ebuild b/virtual/rust/rust-1.48.0.ebuild
new file mode 100644
index 000000000000..7cf8d65440f8
--- /dev/null
+++ b/virtual/rust/rust-1.48.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for Rust language compiler"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND=""
+RDEPEND="|| ( ~dev-lang/rust-${PV}[${MULTILIB_USEDEP}] ~dev-lang/rust-bin-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/virtual/szip/Manifest b/virtual/szip/Manifest
index 3126772fc615..a63fad48de9c 100644
--- a/virtual/szip/Manifest
+++ b/virtual/szip/Manifest
@@ -1,2 +1,2 @@
-EBUILD szip-2.1.ebuild 334 BLAKE2B 800de7b700c65dadf7d4942486e4d05f94c819d7eaf4fce3d7eb9aace961f6393f3607d7387f69580558b90f7d2d09e6b8f922db18b6515aa586136d23ee02ac SHA512 b756d7c0466b728ebdf860499bc1149044546d49b8a4df00e55bcb0d8319ce2ea2ec4d5f6d46bffa38f459c4ac356bea5a9dfd915d99df1325e9544a2f9d3e32
+EBUILD szip-2.1.ebuild 333 BLAKE2B df8ce23782c3d939232a2eb0208f8886a18ab4ec9e5340571e3f8d566067aa52f066601f55e5419995c75aec3d63da5c12ef1ce9876f245ea44bcbfcea5e5b60 SHA512 d57bc20f442f96aabb2cca18512fac6b4048ead514b2d46240710ed725c3138f86ed2ab1c26973892b040a069b8dc51f44592a0c139f2848e77d9779cede8640
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/virtual/szip/szip-2.1.ebuild b/virtual/szip/szip-2.1.ebuild
index d648136dbdc8..fbea3986f0db 100644
--- a/virtual/szip/szip-2.1.ebuild
+++ b/virtual/szip/szip-2.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 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 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="|| (
 	sci-libs/libaec[szip]
diff --git a/virtual/tmpfiles/Manifest b/virtual/tmpfiles/Manifest
index 674eaae420dd..267a9da0dd1c 100644
--- a/virtual/tmpfiles/Manifest
+++ b/virtual/tmpfiles/Manifest
@@ -1,2 +1,2 @@
-EBUILD tmpfiles-0.ebuild 472 BLAKE2B 8a264fcbb6cac4593c6138c2c08acf32a6cebf84634b7e671ac986c4b7143de10ffea5a4a254019496575355ad7158a86f5b44f58adc3b5f979f4aa493e86fcd SHA512 345338a111ddc054fbbd99acf48d9da370cc9cfe25be5a9f1cc47a222273b6a323c9edeaf7d8b0fce46a2ba29cd374ecd79559fa82b92c2ce2ccf4f15de4cfb5
+EBUILD tmpfiles-0.ebuild 500 BLAKE2B 5c0e7f6dd68b962898795646a223ea1b7b4296c7c90baedb26325735a3f011e4433d437bf79b8d1c462019326eaf9278b53ae8bdac233119a11ffd85ed6d78a1 SHA512 5a0f6e83d1a04743954d185864a9bfb6bc723fc2bee417f45013ed95448d3fc4c324dc2c526bea2bab783db583382572ca2b21d25a1e92a25091861f2e23c867
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/virtual/tmpfiles/tmpfiles-0.ebuild b/virtual/tmpfiles/tmpfiles-0.ebuild
index 0e75cf705b44..24280945e490 100644
--- a/virtual/tmpfiles/tmpfiles-0.ebuild
+++ b/virtual/tmpfiles/tmpfiles-0.ebuild
@@ -11,4 +11,5 @@ RDEPEND="
 	|| (
 		sys-apps/opentmpfiles
 		sys-apps/systemd
+		sys-apps/systemd-tmpfiles
 	)"
diff --git a/virtual/udev/Manifest b/virtual/udev/Manifest
index 652bafbc8181..370f9e7032b0 100644
--- a/virtual/udev/Manifest
+++ b/virtual/udev/Manifest
@@ -1,3 +1,2 @@
-EBUILD udev-215.ebuild 404 BLAKE2B d8f6d7fba38eb8ba1f6a9a0b8cf970f71df1b042400654e5f673ed5a87fcf5997e0cb79cd09e3af1a540add7d1eef97cd161b23fa270a3f339ecad6df9fa612b SHA512 0e5c7cae2fc2b9ca6041dbf1fc30731fdc6dd9976bd96c7691b68ae95531c2836b72cb76bf12a8fcd17291ec4cfdb3a0649227b71930594740f3198299a71ed1
-EBUILD udev-217.ebuild 410 BLAKE2B 64a13d363866d7c283fe344f6d10f52de33c93888701a59e20c61b0508974949961caa86de77c469e5a0b4e847ecb3b4790b7acaf6bba5287e8b7e05a47b0e84 SHA512 ed6f324f69e27110a528d8151f34ea7885ca49c2e9a6400652f85526234496882fdff4b9eb445ffe60cdd18530a9972d1acae3831be3c4f862fa8cc62c02c247
+EBUILD udev-217-r2.ebuild 373 BLAKE2B ca66d24e76d67796dcfad1339dca3ade98bd4798be13a347fed5cc2bb3caf8b44be4f81648fab686bab57bcb4afeda98bc73ce32e8e760859ea7ed661ffb9e25 SHA512 2bf50317cc76b46a087d2dc19cc9324b8cdfbe9aec2ed57786ea1e786f93594e5e339b0b2e837f3d16c490c2746677d84f623a3858c3d0ebe266ddd626744f50
 MISC metadata.xml 379 BLAKE2B 5b6f06cda07bf27984ccc9d28751ffffab6debce45c8d883d963334f4295e6fdece7de2175290b4ba807aa417c0e0f3ca4c21f262185968f66c76d3f8ac8d0c8 SHA512 8353b418ec271a0ae9ae0d0a6bad81eb941610a989a5497c940929f14c622bf8199ffbc5061bc723977aa3c01aacf66a37f72311cf1f69082982f27503b17013
diff --git a/virtual/udev/udev-215.ebuild b/virtual/udev/udev-215.ebuild
deleted file mode 100644
index 3b71760b74c4..000000000000
--- a/virtual/udev/udev-215.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual to select between different udev daemon providers"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="systemd"
-
-RDEPEND="
-	!systemd? ( || ( >=sys-fs/eudev-1.3 >=sys-fs/udev-208-r1 ) )
-	systemd? ( >=sys-apps/systemd-208:0 )"
diff --git a/virtual/udev/udev-217.ebuild b/virtual/udev/udev-217-r2.ebuild
index 7f18b286a858..a4d4a51402b5 100644
--- a/virtual/udev/udev-217.ebuild
+++ b/virtual/udev/udev-217-r2.ebuild
@@ -1,13 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Virtual to select between different udev daemon providers"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="systemd"
 
 RDEPEND="
-	!systemd? ( || ( >=sys-fs/eudev-2.1.1 >=sys-fs/udev-217 ) )
-	systemd? ( >=sys-apps/systemd-217:0 )"
+	|| (
+		>=sys-fs/eudev-2.1.1
+		>=sys-fs/udev-217
+		>=sys-apps/systemd-217
+	)
+"