gentoo resync : 15.01.2020

70 files changed, 145 insertions, 336 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 64bca25df8f6..3c59011e54a7 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/awk/Manifest b/virtual/awk/Manifest
index 71d6807c9947..b365bd0e0cc4 100644
--- a/virtual/awk/Manifest
+++ b/virtual/awk/Manifest
@@ -1,3 +1,2 @@
-EBUILD awk-0.ebuild 375 BLAKE2B 12597fbfd0d2d72351377ff96845d2bb1c2ee968b410fdb620859562d5afb9d8d046efbe865924dc76f23ce90e94d42bb9b3a1c5683c58ff6d38418000206af2 SHA512 d7754f89999c697c207f4104ff7efa7d89f2ebba22cbd2ade9e303dae01e1932aa9be173c956548f0993287a7a9b04bb7e56748207912146dbe80e3bde7b62ff
 EBUILD awk-1.ebuild 469 BLAKE2B baec7add7bf2318376f25af180368a473ae1d68007e3eb4b7fbcf2c4e3173b6705483e698402b4c50f6e736982bb72b8bfd6cca7b2e7d34e9fbd991384330b29 SHA512 1a75a610a7ae2dfc7105b2d9dcda5122351ce3e95e6c99d78d482174acec544524f1c09a7c860bccdd1f7f8194e178105b1716d71fa247bc93470cc832006222
 MISC metadata.xml 385 BLAKE2B d0c65503a8aec0e10e4412c3655df206935ea988ffc0f1285965c3bddb6fe84868f80a95b91612a3dcddc22ed6cb2d616d1e9f5fa294e70a3019a375db72763e SHA512 2e19654d5b258ca5e5737a5b59044d870a3b11211f4c4cd5eb92fd2ce1af8ae1082f04128d57efcd879055bfc223a7d32f5ddc3c0b933d9c0a6279aaa90f5833
diff --git a/virtual/awk/awk-0.ebuild b/virtual/awk/awk-0.ebuild
deleted file mode 100644
index 408e646fd0e7..000000000000
--- a/virtual/awk/awk-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for awk implementation"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-RDEPEND="
-	|| (
-		sys-apps/gawk
-		sys-apps/mawk
-		sys-apps/nawk
-		sys-apps/busybox
-	)"
diff --git a/virtual/blas/Manifest b/virtual/blas/Manifest
index 6b8326161bf8..42059428b85a 100644
--- a/virtual/blas/Manifest
+++ b/virtual/blas/Manifest
@@ -1,5 +1,5 @@
 EBUILD blas-1.0.ebuild 416 BLAKE2B 45e2c1116ecccc1490586ab5a367a98490385309910dbfcbee7fdafb842a3b5ae7686c66c720c7e64da5284bdd48cab7180e4fad4c35b63bcc2d9d74911d4633 SHA512 f1d2cc871c1905046f61da3a9f3955662444a2fa45a0fc653cc2fb8d46d4d8ad0c5527a18129c2c8caf0b698366779aeafe541cc0793740aca127dc7f47f2805
 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 550 BLAKE2B 7c1d849de02e7bc844cd4ef7695513e69a42e1563d79499225f869025a4407da743f540eb6cd0ee2151f835e7040d71c1eb4393bb671da101c6d78d4c7b8cfc8 SHA512 e7aa0f5ab0268e1ace46bfef8abdf2deff0643da5b271fdbacb1024f985c556b67a44fb46257922f544aeeae6f0f38bdfdff414cd5e5c1b63f597d44240431af
+EBUILD blas-3.8.ebuild 549 BLAKE2B 6bf27b8a2fc9390c625c6e2d4cd779678255de2c02dd862c0673a35f49ab9feb8ca30495939b1bfdcb5ebc3a0fc6cad13b8c889415c0d317f6c487957f3f093a SHA512 500fcd5578f53a885e912f8cfaa05d4efeb0f5effec0b9bf21daafdef7d6b8a3e56d4d32d469d7a1ffd5c350aa13d1182f5897f71e52d336e33aa404a05380c7
 MISC metadata.xml 522 BLAKE2B fbaf0c9e2e5611db496efd183e8429dcf90a2b7926c9d4baf9be38736f15127b3e721dc0b9a6323ccde12e9fb55fd8438e6fdb75105cb5aea610687a9d11d8d0 SHA512 b9a3489350524b32015a1af2a1a955e407111ddd8d09384ccfa92d423ba7bcba3c45d1a43821715aa67fe177709295151f9046217a7c6010213d0e0ceef82074
diff --git a/virtual/blas/blas-3.8.ebuild b/virtual/blas/blas-3.8.ebuild
index 2cc469338c0d..d11b5e5e6834 100644
--- a/virtual/blas/blas-3.8.ebuild
+++ b/virtual/blas/blas-3.8.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 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"
+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"
 IUSE="eselect-ldso"
 
 RDEPEND="
diff --git a/virtual/cargo/Manifest b/virtual/cargo/Manifest
index c5cdde5a9c18..43cf42832f7c 100644
--- a/virtual/cargo/Manifest
+++ b/virtual/cargo/Manifest
@@ -1,7 +1,5 @@
-EBUILD cargo-1.34.2.ebuild 305 BLAKE2B 40efab792d11fc3359d03a1c05673f7a7b31d270dad9c83c3b401951958c8fa5dd06d3fbd4dfda97a033f60f81502f6bee55ab513631ee6f00231bb475fed047 SHA512 b987fb499c7c73e36c85a972b55a3c27b0cc7fabf0df8ab722089d3286c6bfbe9fe5d9e98a2a4ac6b7aa92a8be17fb546ac4a113da094df19eebb523aa36f09d
-EBUILD cargo-1.35.0.ebuild 306 BLAKE2B 8d84cd18f500d5507106c824119af4c6a60171d225190d3db7e35b807de7965fc53587380ef35c5ff89a3e5d07c3cd7cd2b54abdcf530598d7a0b63d0fa57e5d SHA512 0e27700dbfc5a3921934af8dc9d058c1d7eff0df2d1c35665606938e84e807c3983c4a3c61d7e253fb68ef45e04c3706bd229793d254d40057b9b3196b55d618
-EBUILD cargo-1.36.0.ebuild 307 BLAKE2B 022d840c705307aa791561f239d351deb368e0bbc050fc8d616bc5f13596fb09640f25e846a3562bab9300c6bf735f14795b5ebd421bcc8e5ba1fcf9b4ea303b SHA512 736642b466b5ebc8d87dbdef5096776acc1fb68c9f8b94b3518056a2b2e16307c28c9d1a35935ed48a71b4ab85b6e26ceacdabab1cf44e45bf917de8f3b94bda
 EBUILD cargo-1.37.0.ebuild 303 BLAKE2B 9573787033b25c8f0b969fc1567ae51c2cfad4384e7570e0fffca09825bea7d829a6004be2cb3137b13f90b6d9e3269f3744394e09b095287dfa8d74baf25f7e SHA512 b9a3238a7d29114fc7ccc5fceacd819d9328ff9b9b72952c6d74043f9916d43ae2043fe475bbb8f1014805af3553c61e8ebde7ff1224306b30d973273b9a9dbb
-EBUILD cargo-1.38.0.ebuild 307 BLAKE2B 022d840c705307aa791561f239d351deb368e0bbc050fc8d616bc5f13596fb09640f25e846a3562bab9300c6bf735f14795b5ebd421bcc8e5ba1fcf9b4ea303b SHA512 736642b466b5ebc8d87dbdef5096776acc1fb68c9f8b94b3518056a2b2e16307c28c9d1a35935ed48a71b4ab85b6e26ceacdabab1cf44e45bf917de8f3b94bda
+EBUILD cargo-1.38.0.ebuild 312 BLAKE2B 4fd5cb9c25ea7225bef8915055ac6e9dbefe51ff91cc18c3faf9d493941b53fa37ab83427da3370d22d59aa8272018f8e4ba68b4ddace0b9e88d275be614fdfd SHA512 111fa0b3effd310803f8f0284349703be8be2b3f0aee1cf6aedca18093787ec75b00ec8058c9fdde8ff06936d2f9b77f0ee0cac0810953a657af79ea4b227651
 EBUILD cargo-1.39.0.ebuild 307 BLAKE2B 022d840c705307aa791561f239d351deb368e0bbc050fc8d616bc5f13596fb09640f25e846a3562bab9300c6bf735f14795b5ebd421bcc8e5ba1fcf9b4ea303b SHA512 736642b466b5ebc8d87dbdef5096776acc1fb68c9f8b94b3518056a2b2e16307c28c9d1a35935ed48a71b4ab85b6e26ceacdabab1cf44e45bf917de8f3b94bda
+EBUILD cargo-1.40.0.ebuild 289 BLAKE2B f18f50b104b68b0681db5b45c83da60f76e5cbb40985ea8ab41f9e9edbb61d00ea7a4ad04b1c73fe40c538ed579c815f9f1dfed31562012c523068504c335ff7 SHA512 ac44e141b217827344fc4a7e28dedfba9cc513196f3ed5bb492668ae2ebdaab621697cb9766bd01b537426da4acfe39bb395fad0339d6e3196d0525e30f0193f
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/cargo/cargo-1.35.0.ebuild b/virtual/cargo/cargo-1.35.0.ebuild
deleted file mode 100644
index 2c015c4a0d90..000000000000
--- a/virtual/cargo/cargo-1.35.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Package manager for Rust"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
-
-RDEPEND="|| (
-			=dev-lang/rust-${PV}*
-			=dev-lang/rust-bin-${PV}*
-		)"
diff --git a/virtual/cargo/cargo-1.36.0.ebuild b/virtual/cargo/cargo-1.36.0.ebuild
deleted file mode 100644
index 5e7370192922..000000000000
--- a/virtual/cargo/cargo-1.36.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Package manager for Rust"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="|| (
-			=dev-lang/rust-${PV}*
-			=dev-lang/rust-bin-${PV}*
-		)"
diff --git a/virtual/cargo/cargo-1.38.0.ebuild b/virtual/cargo/cargo-1.38.0.ebuild
index 5e7370192922..03936f0889c2 100644
--- a/virtual/cargo/cargo-1.38.0.ebuild
+++ b/virtual/cargo/cargo-1.38.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="|| (
 			=dev-lang/rust-${PV}*
diff --git a/virtual/cargo/cargo-1.34.2.ebuild b/virtual/cargo/cargo-1.40.0.ebuild
index 032ae4f274f3..a36d725b6021 100644
--- a/virtual/cargo/cargo-1.34.2.ebuild
+++ b/virtual/cargo/cargo-1.40.0.ebuild
@@ -4,12 +4,10 @@
 EAPI=7
 
 DESCRIPTION="Package manager for Rust"
-HOMEPAGE=""
-SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="|| (
 			=dev-lang/rust-${PV}*
diff --git a/virtual/cblas/Manifest b/virtual/cblas/Manifest
index 19dcb229571d..ce5db8477fd2 100644
--- a/virtual/cblas/Manifest
+++ b/virtual/cblas/Manifest
@@ -1,5 +1,5 @@
 EBUILD cblas-1.0.ebuild 395 BLAKE2B b6c35afc3a91480042ec0affab3922f54aa152b2c76970c89cd670882203c85c57144a4135a8ff6a37d8a554a03005a3edc96b523510af962c89ae3994eb02cb SHA512 3624829255e6f0a6adff8e0b7b6490b68fd3b498e6d8e045a0ce7bec11b5082b998d933d93dad5edf7a6b4412383f9ce040db59882cf0be1c52d651403a9d984
 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 527 BLAKE2B 66b5b02eceb68d01cf909a14bb5f824b8adfb658fb0519710cbb3ce15bc09d2b363c4fc843cba730da34c62126e3e05aa4afc0660e3ad530290a2dc6ef221ceb SHA512 0e4800f31b76ebef1bf7e9e8af99d3fb9641675b1140363a2bbba22022bd2e3d99caba6d6fdd45a7f7e483bde2a131c21d6b6f1925f68a825864a487413821ad
+EBUILD cblas-3.8.ebuild 525 BLAKE2B f08ca3a1741631f87c5eefe156f317af65afb4878ef5cf2ab1fc913a4ead75acbd4fc5d47ad4a39e11aa684bac70c7f8c90cd5a6d0f3abc65391628805d8e359 SHA512 a03be379ccd9323e35b64f6f7e7b5d9e06913b24ce26f11acdc5c4eaff010addf20c2367a89251bca5e2e321b8b34347d00ec4154bef1da005fa71f699e7edd4
 MISC metadata.xml 513 BLAKE2B 8c3f2c5ba84f8a0c1b1aaa3028df391d2d588c3ea7992b7bdca88128be1acfceb0b0b8bb965cae6b5855733a03ae37fec24ec770e344872cc6f555bf516efd18 SHA512 247b1f3c0cbb51535ddda9d95667b1b328448513589c1b1dfaf8e88f951564744910c582fc6524a777e1ca898e66cafa98b865cd60c7374374a4e1fd7bd9b3e6
diff --git a/virtual/cblas/cblas-3.8.ebuild b/virtual/cblas/cblas-3.8.ebuild
index 998b30ba4e52..fecfb8d803bd 100644
--- a/virtual/cblas/cblas-3.8.ebuild
+++ b/virtual/cblas/cblas-3.8.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 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"
+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="
diff --git a/virtual/editor/Manifest b/virtual/editor/Manifest
index 6ea9c467260e..bc0c8d5e1fab 100644
--- a/virtual/editor/Manifest
+++ b/virtual/editor/Manifest
@@ -1,2 +1,2 @@
-EBUILD editor-0-r2.ebuild 1422 BLAKE2B 5c6dd988b066427b20df221cc534de99a66560546ed940f95aa0c244afe1d12b8102ad722d3f2c003025e804ca0f48cbca4d56c6423cc5c71046e52b236901fc SHA512 2e6e01f919482c5634fd6cb25013aca306ef7c570bc14e0e40e1db382686bb53a986ff1ccfcc683efcdf60115b74b5125c06e0042aca3cbb5495c33238ad5550
+EBUILD editor-0-r3.ebuild 1401 BLAKE2B 15040a624ce827064efdc37d21f2994cc79d1dc7ca4c3d2a6c5dfb79266c6f0f139d033965b8ef33464ce476d5c06832d3640f615a425597bf94f79a024f96fb SHA512 5d688d79f7d22ffa14c5ce572fa221cfc878885efe0ba3b624c7a4ab3091ca6adc8c8dfc22ea8cfc0fc07abf6a17e240cfadbb40bc92d3dfa4bfb9db0c8cc41e
 MISC metadata.xml 475 BLAKE2B 04e3bc8d0eda87d6d57801992c848a5a2e68bb69b3688d2be4a7018ff4bdbde6fbab15fe16191b5c2b0b3e32a56a596931a7877160f1c265a0229a71d70bce64 SHA512 ffe46c6473a0f3d81555997b3d90569f90eb3dd467f8746430d7fac34832ce3697d2af68b508f9dcf44d5b232396ceca174daf5bcd71e7fd413f7007cc2bfe60
diff --git a/virtual/editor/editor-0-r2.ebuild b/virtual/editor/editor-0-r3.ebuild
index af519d12d5c3..90299d06ddf8 100644
--- a/virtual/editor/editor-0-r2.ebuild
+++ b/virtual/editor/editor-0-r3.ebuild
@@ -18,8 +18,7 @@ RDEPEND="|| (
 	app-editors/e3
 	app-editors/ee
 	app-editors/elvis
-	app-editors/emacs
-	app-editors/emacs-vcs
+	app-editors/emacs:*
 	app-editors/emact
 	app-editors/ersatz-emacs
 	app-editors/fe
diff --git a/virtual/emacs/Manifest b/virtual/emacs/Manifest
index bbffec82ca91..b31121c49fcb 100644
--- a/virtual/emacs/Manifest
+++ b/virtual/emacs/Manifest
@@ -1,5 +1,5 @@
 EBUILD emacs-23.ebuild 307 BLAKE2B 42d776c65622c57824a90313d242ef9a85cb9f41cc99f3febb82ae6f31385dd7ca8d738267280aa34ffb8da4842c243d8594e5146a597750f72e94b325aafd01 SHA512 889360d7ae458b309a9470e199b0b8da12408d6f4af0748f627d89f332963bd8e7d5418c0040c27aec4cb7e14cd86a86baa08369897cb3db5f1985bc7f88565c
 EBUILD emacs-24.ebuild 319 BLAKE2B 8ef93f5da5718c3fed34e569cefce98f22af7fa0c9e6f5a345f7e64c08ae3c220bbd93b12dbc6e53d1a1620b5cd911d186fbe081102b746df8db1e6de6935361 SHA512 a5db7bb95a7bd2e5eeaaa23b6c3ca89b534f2a12bbf694d26ad734210d7480a53a71fe281008603bff10ed08beade924ad3ae776162cac78f819f1fe91808dce
 EBUILD emacs-25.ebuild 328 BLAKE2B c053909745f5661796ef816c8c37b63e9b96d88755e32eef194afd7919cc2c10fe66d4ec83704072b49a0608ad74051d7ff327b73bb584e962a277c8b5a1c2af SHA512 35a61a317fb2545560f754d9c39a733dcf022741910a63245d54a678dc0a1ad0e08ef641860bed7ba2ea85ac4b4b0befd0fb27bb0b677f309f01ec07479f79d8
-EBUILD emacs-26.ebuild 374 BLAKE2B 278f814392cab946b6704dec4730b914a4743381ac41b2a70f11d7493cebef8eee4840834d9ce20251a10a44c7ce15341c906ba47cbbadb994136f828153275d SHA512 fcb79545b688ab426a9c7820973165cdc0c5a1ae2c686eed50ad7795c87b1e810fbeaab0370c1434afa10183d2787201e516dd8ffad00d58f0a3256fab11f05f
+EBUILD emacs-26-r2.ebuild 344 BLAKE2B 918fc412c2e95703d0742be87c596bf82afc5258cb29b85aa5335facd755377ae88d0449d67503eab1d9d1df538fa7a6d86e52eaa93394fbae474fdc9dc06518 SHA512 944d0abbcd3d4f0900e39e96ab3bdd1881bef13be9d3f961e1c82b87ebfb18cb87390d60428ce8858802ff7e55903212e179cbe1ca9c8478b597d7d2fa745057
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/virtual/emacs/emacs-26.ebuild b/virtual/emacs/emacs-26-r2.ebuild
index 29f5152e6e5d..07b2f01d4c52 100644
--- a/virtual/emacs/emacs-26.ebuild
+++ b/virtual/emacs/emacs-26-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Virtual for GNU Emacs"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
-RDEPEND="|| ( app-editors/emacs:26 >=app-editors/emacs-vcs-26.1 )"
+RDEPEND=">=app-editors/emacs-26.1:*"
diff --git a/virtual/httpd-php/Manifest b/virtual/httpd-php/Manifest
index daf539538457..cc5265d694d1 100644
--- a/virtual/httpd-php/Manifest
+++ b/virtual/httpd-php/Manifest
@@ -1,4 +1,3 @@
-EBUILD httpd-php-5.6.ebuild 435 BLAKE2B c45412b8eeb3cd97e18ed44cf68702409ad85409f48b97ab82774f3da8d78d4072f1202dc9e640f8a692575868bf7e1b91f5289a373589df4dc54a4097cbc54d SHA512 44b8641a215b6579201633c9ba7950c33d0d86574f0295bf3ab13c86d1ca6ade5317f445b0b3e9e6af4fb279eca116c64ad514368311e53999007486d0964784
 EBUILD httpd-php-7.1.ebuild 431 BLAKE2B 50d2ff6d96ef8924f2a74b107966c3b213b9b62d773066914f90e1aacaad33c59d3fc0b44d348d933c2dfc6005ca7c19401751c1065a4bb7637158d35de6b9a4 SHA512 4eab9c74586223b757c172f782183811a908a9e8a5ee73068f1f638bfd6ace5b1acb141c3bca8545fecdc4eef9280be719c59430e429261d7ee3516fb57fb74f
 EBUILD httpd-php-7.2.ebuild 431 BLAKE2B 50d2ff6d96ef8924f2a74b107966c3b213b9b62d773066914f90e1aacaad33c59d3fc0b44d348d933c2dfc6005ca7c19401751c1065a4bb7637158d35de6b9a4 SHA512 4eab9c74586223b757c172f782183811a908a9e8a5ee73068f1f638bfd6ace5b1acb141c3bca8545fecdc4eef9280be719c59430e429261d7ee3516fb57fb74f
 EBUILD httpd-php-7.3.ebuild 431 BLAKE2B 50d2ff6d96ef8924f2a74b107966c3b213b9b62d773066914f90e1aacaad33c59d3fc0b44d348d933c2dfc6005ca7c19401751c1065a4bb7637158d35de6b9a4 SHA512 4eab9c74586223b757c172f782183811a908a9e8a5ee73068f1f638bfd6ace5b1acb141c3bca8545fecdc4eef9280be719c59430e429261d7ee3516fb57fb74f
diff --git a/virtual/httpd-php/httpd-php-5.6.ebuild b/virtual/httpd-php/httpd-php-5.6.ebuild
deleted file mode 100644
index d07472714d19..000000000000
--- a/virtual/httpd-php/httpd-php-5.6.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Virtual to provide PHP-enabled webservers"
-SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
-			  dev-lang/php:${SLOT}[apache2]
-			  dev-lang/php:${SLOT}[cgi] )"
diff --git a/virtual/lapack/Manifest b/virtual/lapack/Manifest
index cdb6f4c253e3..db5584c7f2b5 100644
--- a/virtual/lapack/Manifest
+++ b/virtual/lapack/Manifest
@@ -2,5 +2,5 @@ EBUILD lapack-3.0.ebuild 334 BLAKE2B 451c8bf97c8a8ad0c9574f10d0001092081276c4ec4
 EBUILD lapack-3.1.ebuild 404 BLAKE2B 31d0e5eb3dd90d68f334f694ec7159c9b362b8082e6cde59f655f7a7e1d9ce63b58ac1204e33cd70149e6092f4ef8efa2e1faf868c09d56fc1e929d8b66ccf35 SHA512 1212403acb2787f7b63b35d274a7604242f2eb2e759956f51613287e2ddc07909c4858d8fee2bc2a3a4101a6d6827a209b7cd2a63f4ec2ff7d7d06c9ebae7904
 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 528 BLAKE2B 49530dc748619bbae2e56c1425047416fdbd3da9bd7f1a15083aa73f58f6ac6dab8cb92a6b6ed4d4a173869fc2906d4edb780902bfb39c58339216a98117752e SHA512 7edbe707b3da4eea401efa20cd5b3922f843a3db41b32538afbd4b2fed9525ba03088912b4529bc121edc527f60c19e32c02e1b9180527055016570ddb0810e9
+EBUILD lapack-3.8.ebuild 527 BLAKE2B a57f82960fdb6c21c4560a59115770ad24eb65957ce6058aae484ef4383b0b42b89ae07564bf17693705d7f5e547486e23bca68583d775b09f70b887026acbf7 SHA512 a7f11ccd270b50100c865cb6dea263d412f096664e4683f908242ee0792684b85acc797aaba96482f314d4c9e8ff8a71d5e72d52511a6c8e19ac4b01c9f10e71
 MISC metadata.xml 512 BLAKE2B 4fbd9b4b12e1bc72c6b031655b1b9cf39837e5afb995129dbcff75ce741b6d523d5ec81401b8992dbd501bd340da864416f960fa9fb4f0dee3e59096160ddc7e SHA512 3baf1a95b1ab22dae8d3ae0492c6116d1ca8e2b780d4b8f047e01eb3edd12753cff367f0022a7d6e1f926d4afba45892d0cd8be6ecef61a0e9bf4e7f2b023b3f
diff --git a/virtual/lapack/lapack-3.8.ebuild b/virtual/lapack/lapack-3.8.ebuild
index 635b66e5b6ea..f453edf66c35 100644
--- a/virtual/lapack/lapack-3.8.ebuild
+++ b/virtual/lapack/lapack-3.8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 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"
+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="
diff --git a/virtual/linux-sources/Manifest b/virtual/linux-sources/Manifest
index 1389c2e19cc3..f9c4e8ecc315 100644
--- a/virtual/linux-sources/Manifest
+++ b/virtual/linux-sources/Manifest
@@ -1,3 +1,2 @@
-EBUILD linux-sources-3-r1.ebuild 659 BLAKE2B b93944c890122fabf04beda06400e63d2db48d0ed2c4724c572908e14b1fb89b680f732f9278b0cc94782dd714e93a647d599eb6699cec7e8f7efa44d61c7d13 SHA512 5d65feafe088006da046fa00b5513b74d521ad8442386f3fd4499145551fffaa67db31cdaea7ce11c60cdc587a234cef82277dd28ef54e53d2ba7ee4f9b0d950
-EBUILD linux-sources-3.ebuild 708 BLAKE2B 48dcb4bb9fa0a812c0a38b04a460e47eedf75c4db591d7dc396bc16d93209bb8d824fa920f989986c877ab16cba56e80a2515ee9b50e464bd64a0cc658b570b5 SHA512 d12e6390e7a5bb36826995b0e88f164e458e3ce19c0d9a6b26851a80b563616be37f57f53c1e27bff9d63775d3ffe499aacb915cfbd30ae8ee5733d585e99d64
+EBUILD linux-sources-3-r3.ebuild 707 BLAKE2B c6045854da27a0822dd04934b700245c7c8043034d135b6c7a44e7277747529506c638e6bf18a0583b7bd496c00f15a3b3d34cd4cabd72231bea6446234ab5b9 SHA512 3aea7cb3d711052d887b17bc8e3667d612f5db3b8f5ee53b58e83ffd1db0097bdf1863af850ff811e001604c0e406bb7c45acc48f712b00d2176651fd5b51d4b
 MISC metadata.xml 444 BLAKE2B d75ec48cf4e1cb32478b32a6f15c3a0e3e42c9e99ac53d73386916553ec0566f5b7004532ad7728f7b6637255508310234f75105f820a4e7251efca16d8eb51d SHA512 e97f24d20680fd1175fc34a17eb76a88da055a0b9ce0d283daf93d7ef65f79a3bdee48293c850f5ce51369810534feb24273f02ef5f9f7c2f33f716f3b8c3200
diff --git a/virtual/linux-sources/linux-sources-3-r1.ebuild b/virtual/linux-sources/linux-sources-3-r1.ebuild
deleted file mode 100644
index e3959f883fd6..000000000000
--- a/virtual/linux-sources/linux-sources-3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for Linux kernel sources"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="firmware"
-
-RDEPEND="
-	firmware? ( sys-kernel/linux-firmware )
-	|| (
-		sys-kernel/gentoo-sources
-		sys-kernel/vanilla-sources
-		sys-kernel/ck-sources
-		sys-kernel/git-sources
-		sys-kernel/hardened-sources
-		sys-kernel/mips-sources
-		sys-kernel/pf-sources
-		sys-kernel/rt-sources
-		sys-kernel/xbox-sources
-		sys-kernel/zen-sources
-		sys-kernel/aufs-sources
-		sys-kernel/raspberrypi-sources
-	)"
diff --git a/virtual/linux-sources/linux-sources-3.ebuild b/virtual/linux-sources/linux-sources-3-r3.ebuild
index deaea9a73127..0912e7de34be 100644
--- a/virtual/linux-sources/linux-sources-3.ebuild
+++ b/virtual/linux-sources/linux-sources-3-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Virtual for Linux kernel sources"
 SLOT="0"
@@ -17,12 +17,12 @@ RDEPEND="
 		sys-kernel/git-sources
 		sys-kernel/hardened-sources
 		sys-kernel/mips-sources
-		sys-kernel/openvz-sources
 		sys-kernel/pf-sources
 		sys-kernel/rt-sources
-		sys-kernel/tuxonice-sources
 		sys-kernel/xbox-sources
 		sys-kernel/zen-sources
 		sys-kernel/aufs-sources
 		sys-kernel/raspberrypi-sources
+		sys-kernel/vanilla-kernel
+		sys-kernel/vanilla-kernel-bin
 	)"
diff --git a/virtual/pam/Manifest b/virtual/pam/Manifest
deleted file mode 100644
index d96560e9f13d..000000000000
--- a/virtual/pam/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD pam-0-r1.ebuild 444 BLAKE2B 00577ffb77df23481fe121ccff51feaa9c8efc542990659c465e9d9338004be20a21d99033731a03188e16a5412f328c9b222083f51740d8cc0c80eee4e7c8f3 SHA512 09bf0aa36ff42ece632417439eaff5f3e81c290d811f6dc5f6de2b22184cb0752e4baee87fdf7462e3be2c771acead81abba619a75eafb05764b42fc964dc9bc
-MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/virtual/pam/metadata.xml b/virtual/pam/metadata.xml
deleted file mode 100644
index 203fa55c746f..000000000000
--- a/virtual/pam/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>zlogene@gentoo.org</email>
-	<name>Mikle Kolyada</name>
-</maintainer>
-</pkgmetadata>
diff --git a/virtual/pam/pam-0-r1.ebuild b/virtual/pam/pam-0-r1.ebuild
deleted file mode 100644
index a7a4ce1fd6cf..000000000000
--- a/virtual/pam/pam-0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for PAM (Pluggable Authentication Modules)"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	|| (
-		>=sys-libs/pam-1.1.6-r2[${MULTILIB_USEDEP}]
-		>=sys-auth/openpam-20120526-r1[${MULTILIB_USEDEP}]
-	)"
diff --git a/virtual/pypy/Manifest b/virtual/pypy/Manifest
index 363d13ca126c..4ec82e63d474 100644
--- a/virtual/pypy/Manifest
+++ b/virtual/pypy/Manifest
@@ -1,3 +1,2 @@
-EBUILD pypy-7.2.0.ebuild 544 BLAKE2B c068ff0cf5e1a2f5fe4d4b374e043b17164434a182baea4c92757f6412ae69ac2244662259189d6ee2b4b9ecd63d667d2979b05dd64b1e41bac7f9410cc224f4 SHA512 e3f4d6f6bf8eeef03454f929293f6280dd4f980b0870e47780a7272e77b38e427f9c3881b6871349a0e47c9dfe17f5b215b7b50d58910abc3704d5a1cd9a9b77
-EBUILD pypy-7.3.0_rc1.ebuild 451 BLAKE2B e1850d4541414da6260b1840da6bf89ce00626c7dc33f88f28f8dcd7413db0e70dc50141f5d9fafe69d1fd7d662207f3978ab35f15eacd3fd9658db27be77ca0 SHA512 a4eab000120b17c89f39921b7504ce3586031cdd49e9994f815724b3c28fb6874ab00e14b66d990031feb2a6977ead64b163b191e802d90658dc9b28b1432b81
+EBUILD pypy-7.3.0.ebuild 426 BLAKE2B d2b625fb2c96af719c7e02732e0091471507f6815fc4688a1bbd1ca067395084e4d3e3b08b4e102b7cda10f716f85753c76e157e634476eb1a95dcd4dd62f98c SHA512 ce785b1894ac305f269dd968ae3a80a83dde2c9fc5eea736f68d35ee7078cad607260d41249fe9a50f0101d1fd3d15b69d16627c64c149b60bf76ebe8bb90a4f
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/pypy/pypy-7.2.0.ebuild b/virtual/pypy/pypy-7.2.0.ebuild
deleted file mode 100644
index 76abaa124207..000000000000
--- a/virtual/pypy/pypy-7.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A virtual for PyPy Python implementation"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-		>=dev-python/pypy-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
-	)"
diff --git a/virtual/pypy/pypy-7.3.0_rc1.ebuild b/virtual/pypy/pypy-7.3.0.ebuild
index fccd6826ff2c..d6da859f3bb5 100644
--- a/virtual/pypy/pypy-7.3.0_rc1.ebuild
+++ b/virtual/pypy/pypy-7.3.0.ebuild
@@ -3,14 +3,11 @@
 
 EAPI=7
 
-DESCRIPTION="A virtual for PyPy Python implementation"
+DESCRIPTION="An obsolete virtual for PyPy Python implementation"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm ncurses sqlite tk"
 
 RDEPEND="
-	|| (
-		>=dev-python/pypy-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-		>=dev-python/pypy-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
-	)"
+	>=dev-python/pypy-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]"
diff --git a/virtual/pypy3/Manifest b/virtual/pypy3/Manifest
index a2dae05e349c..14c5bc235323 100644
--- a/virtual/pypy3/Manifest
+++ b/virtual/pypy3/Manifest
@@ -1,3 +1,2 @@
-EBUILD pypy3-7.2.0.ebuild 496 BLAKE2B 651ebfc8b0c56a578b9c349710424599ee3c3a3cc85047b80bcd8ec48ffceb0fa8c0045406e436d2e60551fc6b86def1a2f6ba501748dd9ca2aff1adcc7f221c SHA512 1be8b5e189cbc92c1e6b1e0b29bb69f3dddd1fb56b7bf5cd2447edf2beb21e5622cfcfe6c4aac8faa30f2d4ad72d75c4787a4455679a557d92380d3ccdaa7e7c
-EBUILD pypy3-7.3.0_rc1.ebuild 461 BLAKE2B 0cc1db001357945d5c5924686f31d76dcb7b41dd1cb6356378bde1002108bc4ccb3b222848d288e383799ae7af9337171b9267a459830261c4d081457bbd47c1 SHA512 b5840371752e715ffdd5121cf774c9946060a28b5e33f1b3fd86d835c2e63868cc2a2ae5b59f7a84f55d08621c40c82a3d274a83a263a79241b3ee03d8da3248
+EBUILD pypy3-7.3.0.ebuild 439 BLAKE2B 2110a7ee262a03ac4ea18a88e32265655d8ff2534b398f7ccd5ebe4f33584da8c44a2fd800075d16901b84f03c8a9da8ad32753d861659761ce5666692d95d63 SHA512 f1873e05937d7fbb02bfbce9a9954d80e55abd4db24c88e1a93ed6ce9c67baf85233b511bd16a1ca596168fd2427d41cbc89a023484d3ca40b3d6f642739100e
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/pypy3/pypy3-7.2.0.ebuild b/virtual/pypy3/pypy3-7.3.0.ebuild
index 7f21db04c902..76e6e9bb3d6e 100644
--- a/virtual/pypy3/pypy3-7.2.0.ebuild
+++ b/virtual/pypy3/pypy3-7.3.0.ebuild
@@ -3,14 +3,11 @@
 
 EAPI=7
 
-DESCRIPTION="A virtual for PyPy3 Python implementation"
+DESCRIPTION="An obsolete virtual for PyPy3 Python implementation"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/72-py36"
+SLOT="0/pypy36-pp73"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm ncurses sqlite tk"
 
 RDEPEND="
-	|| (
-		>=dev-python/pypy3-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-		>=dev-python/pypy3-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
-	)"
+	>=dev-python/pypy3-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]"
diff --git a/virtual/pypy3/pypy3-7.3.0_rc1.ebuild b/virtual/pypy3/pypy3-7.3.0_rc1.ebuild
deleted file mode 100644
index a67b9df60638..000000000000
--- a/virtual/pypy3/pypy3-7.3.0_rc1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A virtual for PyPy3 Python implementation"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/72-py36"
-KEYWORDS=""
-IUSE="bzip2 gdbm ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy3-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-		>=dev-python/pypy3-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
-	)"
diff --git a/virtual/python-backports_abc/Manifest b/virtual/python-backports_abc/Manifest
index 3b4c8ed3db52..5cf338ed3283 100644
--- a/virtual/python-backports_abc/Manifest
+++ b/virtual/python-backports_abc/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-backports_abc-0.ebuild 493 BLAKE2B 8171b47c51456ff481209b00c6cdf046bdafa4eb95ceee81d91821cbccf50b31bd67ca17c4546d3e95fe8376853938d6632cbf36f6762b7805557b8838af96df SHA512 ef2060b3f680768ebe5b9c507102bbf984915dfc67f18b87cf070aeb39574ed7df1ff5c291fe80eb6db1c68b1ff8c701fb43d4baa60daa06ca46c74dcb75ba0b
+EBUILD python-backports_abc-0.ebuild 486 BLAKE2B 02ce163b30f1d27fa79e7ae5e05eb2d10e1b4dcf2b6c4bf6151267abd1fa2839f0d1f6af25f338a2e9950a2c6a36736e2c3a533e1d018f794bd83d4b1d724285 SHA512 e58ff2d9e5794009d884af109be5467fa94ae44f6e3978c4166e59a51acfb38976053d2cb58932146d7d8e20587f2f85ed7f50c8c68873f6db2c34015d87a64e
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-backports_abc/python-backports_abc-0.ebuild b/virtual/python-backports_abc/python-backports_abc-0.ebuild
index 3060d6c14884..66ce89cef2b8 100644
--- a/virtual/python-backports_abc/python-backports_abc-0.ebuild
+++ b/virtual/python-backports_abc/python-backports_abc-0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit python-r1
 
diff --git a/virtual/python-cffi/Manifest b/virtual/python-cffi/Manifest
index cbd20763d532..abf45ef23de2 100644
--- a/virtual/python-cffi/Manifest
+++ b/virtual/python-cffi/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-cffi-0.ebuild 581 BLAKE2B dd143754e75c176eeab52af15be6dc3f6bf792fa99fb1a915f416ec42025d004ccf961a8961506f611296366f5785a6d976ee30a05dc484f96ce19678fe26b1f SHA512 fdcd75b910b276cf7da896af5ef0c3078264b21133116921b1c5e405f98fb18f349d14a92e91e29ca9dacc4a2962303ee387b55f0cd4d8443f5d79282c1bd92d
+EBUILD python-cffi-0.ebuild 576 BLAKE2B 1fe03da909c3ee3a6c9b4e452847e758f6ceaace6eb9b8a8b034e6453d6b1b47eff5483fc155eb8ab74b4797d9f56d6439656d73e9d9b0092721eb92198c30c0 SHA512 a3c4af24d02b090c98182f124429de00be5b27f5055ad4abacff91b93cd35670e443b498bba4922a65d49450aa2b3d83509deb7c8981e4b713f4a4de44eee9cc
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-cffi/python-cffi-0.ebuild b/virtual/python-cffi/python-cffi-0.ebuild
index dcf236bb4a8e..340eac398187 100644
--- a/virtual/python-cffi/python-cffi-0.ebuild
+++ b/virtual/python-cffi/python-cffi-0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit python-r1
 
diff --git a/virtual/python-enum34/Manifest b/virtual/python-enum34/Manifest
index bfcbc734497f..86aab3b60bd9 100644
--- a/virtual/python-enum34/Manifest
+++ b/virtual/python-enum34/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-enum34-2.ebuild 548 BLAKE2B 1de84abf78f05ece2f264574c78fcac9d55dc981215e5c1ed19ae4155615ad66b7c81f4c6aa7a01c8456518607f6234d014daa9f5eb7aa9cad4e763ab9ebde34 SHA512 5ebf90b29d71706e6fed936cef507d571070ca40a9d034494df2c549436d2ca9d64b19902faf8f5c9fc731f48106c8767939578c146c674d70b8f02e47f9a9e4
+EBUILD python-enum34-2.ebuild 541 BLAKE2B 7b59f3bfcaf76e6bb10192b84065886ab0fd4cfc5296130caf08eed6d7a32980a4599a94fbfba447bb41c2d6eaacd574675b89763710ac49a7b6569b1c217afa SHA512 6f975fd659ab2b95cfeaa3586cb7b3d18b4950cfb3f790b67b5dbeeb8e140a272f99b7024311dd412e4ca1fc0db54c04dc9bab378ac72775e8abdd85c1befb76
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-enum34/python-enum34-2.ebuild b/virtual/python-enum34/python-enum34-2.ebuild
index 1358450bbe9b..498bd7db165b 100644
--- a/virtual/python-enum34/python-enum34-2.ebuild
+++ b/virtual/python-enum34/python-enum34-2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit python-r1
 
diff --git a/virtual/python-funcsigs/Manifest b/virtual/python-funcsigs/Manifest
index ca7b9e9e9a26..099ae4bb6397 100644
--- a/virtual/python-funcsigs/Manifest
+++ b/virtual/python-funcsigs/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-funcsigs-2-r1.ebuild 608 BLAKE2B b864520a3225bdb100c55caa86bd77ce9a62ef02187c58b3b27f1db9c41565d03188b98903ebcd2a7be29590faa57151649c9631fe3ad7c5173886cc8a4aafc6 SHA512 d2a8f617c6c263786e0a00ee9e7dbfec4d10487e9675d8a13db6d3c3a894a359d6f8dab1c9d7b92d4e430e3836ae87dd709b38cbaf65081ca9efa1af6d960f96
+EBUILD python-funcsigs-2-r1.ebuild 578 BLAKE2B 7fbe3e29709c8d182c368b9493d257c74c1d1ddd962fdb0a2e152557b13006c8d268bd9a0b2ca88f8961f269c4fba6e73522062637a8cc865b1384883dc8e703 SHA512 d1a83b09bab7b2e43fac6f1798cfe055480045ba8c7ac61b01834dd1ad3d98e57da119120b1a8a44f3dbec8d439225c9b994e0a3c03f84920f6cc989e9623340
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/virtual/python-funcsigs/python-funcsigs-2-r1.ebuild b/virtual/python-funcsigs/python-funcsigs-2-r1.ebuild
index 0104a230fbbb..593d63d0c613 100644
--- a/virtual/python-funcsigs/python-funcsigs-2-r1.ebuild
+++ b/virtual/python-funcsigs/python-funcsigs-2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit python-r1
 
@@ -14,4 +14,4 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	$(python_gen_cond_dep '>=dev-python/funcsigs-1[${PYTHON_USEDEP}]' python2_7 python3_5 pypy )"
+	$(python_gen_cond_dep '>=dev-python/funcsigs-1[${PYTHON_USEDEP}]' -2)"
diff --git a/virtual/python-futures/Manifest b/virtual/python-futures/Manifest
index f2a935d5b119..1252d6f7dd7d 100644
--- a/virtual/python-futures/Manifest
+++ b/virtual/python-futures/Manifest
@@ -1,3 +1,3 @@
-EBUILD python-futures-0.ebuild 484 BLAKE2B 1201049a8f573eb7c64b47715fe24a0866b4e7603ae39137fe3eb96fb261a45e1dbcdc4dfbe3151315e44e981efca6c13374cca826109cc114c874b1e9bad5c4 SHA512 f2c88812e67bba221bbe0f7d53b5cfdb7e7c87b3abfb3fd92d90c6dd8fc9f0fb8525f18f36f3277e020b17c94392e9656a16955926923a04bb7a4e7586bb1649
-EBUILD python-futures-1.ebuild 504 BLAKE2B c65f9ced839a394b5c22e88a020634cf07f10135c6751f599061b65c23c93a3ba3d2e954b36e94e44d4edec3b0ca40e338ac074dd38f13f82acd867acfa02d07 SHA512 b93bb6fcf3a0c116ac1e4083195c7b620533a3fb71eb1d7a9638abba3b374ccc58b8da71f6fcd4b6409b5f2e915cba3c1d9830a546971469439440adb63a5e50
+EBUILD python-futures-0.ebuild 477 BLAKE2B 7f2cffa39fbc36e82bad6a530e72f0dcf00296459abc247569316b51838326b204ad13f1474aae21012e02f714fbb51b7eab62961d4ecfa6a8d2be542c74e5cd SHA512 b7c51c85ab2b812009740a1e6ed515d557a9e9a39a3450dd26979308370420ac526672da4a5b6ed2e9412682a5086804b1cb933cf8b1839adc306efedc828279
+EBUILD python-futures-1.ebuild 499 BLAKE2B 8cffc6ab7e72854a1da2e8492c2555fd07dad8d804d40588d4170f5e91644ad80a7cfec0e5484c2971c33c5227411a3eca51501c1f9255c8daba33e4acd4cc48 SHA512 547d473ee41f0f0293a87fd77e4c9b4f5e025e46a8643e17c0899c67ab71515ce18190b7d1ba442b90dad3a248ca780d9f94d92fec24e92d622cea095cfc63fa
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-futures/python-futures-0.ebuild b/virtual/python-futures/python-futures-0.ebuild
index 64978329bd47..20dcf9c1b0d4 100644
--- a/virtual/python-futures/python-futures-0.ebuild
+++ b/virtual/python-futures/python-futures-0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit python-r1
 
diff --git a/virtual/python-futures/python-futures-1.ebuild b/virtual/python-futures/python-futures-1.ebuild
index f58e405f5bf9..7affbf4b4864 100644
--- a/virtual/python-futures/python-futures-1.ebuild
+++ b/virtual/python-futures/python-futures-1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit python-r1
 
diff --git a/virtual/python-greenlet/Manifest b/virtual/python-greenlet/Manifest
index 2bc4818c285c..d56f9418ca98 100644
--- a/virtual/python-greenlet/Manifest
+++ b/virtual/python-greenlet/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-greenlet-1.0-r1.ebuild 451 BLAKE2B 9a901f25aa5ae68870edb8b2417e404c794460fe3128c4f1a923dabb374c3d8c7422802050d15a5e79c915bc0ee4f350892a41c6d7224b2da5ef401b3d5421a0 SHA512 8f808dda2001a087deb8fa6bed061d8f096571287a4e79b0fb50a184779ac733d8e08830a890ac793a7377d19f976d4639a0998ba4c829462a03878eda5d7a1f
+EBUILD python-greenlet-1.0-r1.ebuild 446 BLAKE2B f5b8b0962bfd9daf3fc7442ba565f2e23cd292abab90535a0b57427fb808357abf85095067b00f4c34c377e273526bbb13a7b9864dfe53f49afe46f943614b7c SHA512 968e62727d343dbd3d968e6d930373a124e93767d5ec9a8de90b776beb5045edc92ff896fab30df6ce7ee230c1bf6ab58c602b9c1df4cde7b5d3e699b81e7fdb
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-greenlet/python-greenlet-1.0-r1.ebuild b/virtual/python-greenlet/python-greenlet-1.0-r1.ebuild
index 0144bc67fa53..71bb8dd147c3 100644
--- a/virtual/python-greenlet/python-greenlet-1.0-r1.ebuild
+++ b/virtual/python-greenlet/python-greenlet-1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit python-r1
 
diff --git a/virtual/python-ipaddress/Manifest b/virtual/python-ipaddress/Manifest
index c20053867516..4feb1b660584 100644
--- a/virtual/python-ipaddress/Manifest
+++ b/virtual/python-ipaddress/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-ipaddress-1.0-r1.ebuild 598 BLAKE2B b12352d6583ec8b20115b83ac27e45d4df6dc830a5f32abdd568e1372306cb2fdf2c10f6ee535ce9562a5010aa337c5b24dc73d5c63a1faac7162a2a163b4de4 SHA512 1f1ea3f59778b06f757bb491b6a35885c75b5d2c8334118f57c1edbb25526b919647cd922e91380ea0364590020884430c9f8a2a150760159ad2debfa589bba9
+EBUILD python-ipaddress-1.0-r1.ebuild 591 BLAKE2B 37d78fabe58f97baf0ff29cb2ba3e93b4bb4954e37bc64a8d779511864ef4be95e3f6f885ec0f47fbdc862bb529b35c842757a97078ad61b6d77ddd71d2a219c SHA512 965ac061c669674fd614f114f7d7eff33ec6c1260234f9059899e6e3f7dbfe39c5e00726344c8343e78d16791b818bd277359f7641d47f719a4f7040a999b989
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild b/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild
index cc3091a0a4ef..607e461a5e8c 100644
--- a/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild
+++ b/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit python-r1
 
diff --git a/virtual/python-pathlib/Manifest b/virtual/python-pathlib/Manifest
index 0ee2d82e47d6..86f92f7859ec 100644
--- a/virtual/python-pathlib/Manifest
+++ b/virtual/python-pathlib/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-pathlib-1.0.ebuild 450 BLAKE2B c222a2cf0667ed26952771b1f476b656d5298118daa1cf6ec99836f7e8de2cbb23ef07101fc7f290db900ae4118986d58eb611ab1f471c1f2b17e7d66ebdfc3c SHA512 b5e67d439dbe458f453997e4dfc4016c825669f40b7ddb4db6b3d2d158bb83467bff71d53487d3c2c74df636ecdab9588ccac7a441d7a2efbf75207ffcb51c26
+EBUILD python-pathlib-1.0.ebuild 449 BLAKE2B 88dbe1a44c200d48ab5c26c432e3eb3d6782650d0dba9da46e47af60afb1fcab6a0ea29829af87e2b9b7d582adab1ca87e5276c4e2e7ccdb2fb8928a04af45e6 SHA512 82b8fd090e3d54f61cf40a3bd3cb729599402ae8329b727b8a92d097298c0f1b72d7d39b864a975e285d5452935bc65b829b65924e93438fa0700abb95974807
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-pathlib/python-pathlib-1.0.ebuild b/virtual/python-pathlib/python-pathlib-1.0.ebuild
index 80943c77076a..b12419774b63 100644
--- a/virtual/python-pathlib/python-pathlib-1.0.ebuild
+++ b/virtual/python-pathlib/python-pathlib-1.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit python-r1
 
 DESCRIPTION="A virtual for Python pathlib module"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ~ppc ppc64 ~sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/virtual/python-singledispatch/Manifest b/virtual/python-singledispatch/Manifest
index 55c38d10def8..d6b682aa8324 100644
--- a/virtual/python-singledispatch/Manifest
+++ b/virtual/python-singledispatch/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-singledispatch-0.ebuild 529 BLAKE2B 088c901ce4c488f8125ef83655daec5cc6e7ed49182693529d6e1139eefb1b4e4f5b6bb7b7950549ecde2823d8c4890a289d5437841220fe6025918c600d637b SHA512 754ea2fff0b44adfae478b8507a260190d430bf4153c0415c15da7db4413b130257663018515742d58944e561bb4bfc6918e530903e61bca969c94ff6e88f934
+EBUILD python-singledispatch-0.ebuild 522 BLAKE2B 7db75d51dfaee8fb8e697516f3813e487e6d5ced58fb3b35bd259a582f32f59ec008ae1dc154d76868fd0294bc8aa2ddfaabb980697790eaa42f7abe2c8cb77d SHA512 73d1ee957357a63fe8ebe42e01de8c2f57f0b2046f9f13699d945f45f7d00c8c166812d6a83b678232d347b1e7a56a60b680761da38e983e7a0b447ead444808
 MISC metadata.xml 386 BLAKE2B 2a6a959db0caa9e906f7ed96958366ba41bd36b8640d2ccf685faf50d44be723215773b4f056882ccc293b4b41025aec4b12586332ccc70b830d7f45fd57a1af SHA512 ba80e7786de3377de21e2511dca3bbdd8af41f5b6ba2976423bf83dc8ad1ed7f14165cc52538f33c5cf6a2086181fcc3b3f191480bd93b581704b11b93a00739
diff --git a/virtual/python-singledispatch/python-singledispatch-0.ebuild b/virtual/python-singledispatch/python-singledispatch-0.ebuild
index de4f135df52e..b18ceb402afa 100644
--- a/virtual/python-singledispatch/python-singledispatch-0.ebuild
+++ b/virtual/python-singledispatch/python-singledispatch-0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit python-r1
 
diff --git a/virtual/python-typing/Manifest b/virtual/python-typing/Manifest
index 955af4c34c93..3ec98db93880 100644
--- a/virtual/python-typing/Manifest
+++ b/virtual/python-typing/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-typing-0-r1.ebuild 506 BLAKE2B 9b02fbdc675c2eb6d973198450960896ff83d705dbe690b3b2644ce53300bc0abc6379951661ebbb4c3a0f3ea675a15b952481b49cec59b45e47a1b83b98854e SHA512 34cfec27c53d8a4bee9d8af5773d87180141a1ff00f80c6432b0238cfce267d24ab98a743e746a2b1c7c3107bbd2bde3c48a953e07b19172e1de8fcde364c405
+EBUILD python-typing-0-r1.ebuild 499 BLAKE2B b0f077e429d5f1431e939573b9cce181c5d065eb4e5fbb9d0e624e5e9b959f3ff8d9062892d21a4e3ed587ec25af453f23f4fecc9ce8cea9a6e2c1dfc8ad9682 SHA512 09146241732527c84653f658b0b06b40f7490dc071fa5056c3d2b326cb7016de3d48a7c44159da7215c5183922c18731b6a1b0f6261bcf52e2b99775c804e388
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-typing/python-typing-0-r1.ebuild b/virtual/python-typing/python-typing-0-r1.ebuild
index 779c0a176e6c..adefd4087421 100644
--- a/virtual/python-typing/python-typing-0-r1.ebuild
+++ b/virtual/python-typing/python-typing-0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
 
 inherit python-r1
 
diff --git a/virtual/python-unittest-mock/Manifest b/virtual/python-unittest-mock/Manifest
index 5cba700963e8..92ca11226500 100644
--- a/virtual/python-unittest-mock/Manifest
+++ b/virtual/python-unittest-mock/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-unittest-mock-1.ebuild 504 BLAKE2B 6cfd8d073419697e5de9989a7e5603e577d705d07e26dd2007508a87665aaec13774af631c8744201a40b2409d12c6ea6c9c43e009bf23d888e45259ed11e73a SHA512 a2ea36cf046ae265ae3029800c2c2b3699b290748f12a1d034f3335699d75bfc8fa5d2c16e70d487027b863d6e58c8b781e5a0d74fdf25beb6d3bba79e7b2d27
+EBUILD python-unittest-mock-1.ebuild 497 BLAKE2B 4f4c764e1336431a26904adf2554765c9a4896f218ea98fec5efa40febd2bd7caffdfb71cb7511085b29a868a8aad6c7554b771597d28ffbb74f7f41bb649fd2 SHA512 046cbe1e9be2aa4c988e85a59d2d7776cc2b82cba91d5a00fe7fe5a23fb8ca13fda6939288a8907e9dab8912ac677c29a0210be55438f587e9bc4d7de1bd1f5c
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-unittest-mock/python-unittest-mock-1.ebuild b/virtual/python-unittest-mock/python-unittest-mock-1.ebuild
index 2ea3d0e53312..f688b601c41a 100644
--- a/virtual/python-unittest-mock/python-unittest-mock-1.ebuild
+++ b/virtual/python-unittest-mock/python-unittest-mock-1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit python-r1
 
diff --git a/virtual/rubygems/Manifest b/virtual/rubygems/Manifest
index c6118617e952..43f9b9e47f49 100644
--- a/virtual/rubygems/Manifest
+++ b/virtual/rubygems/Manifest
@@ -1,2 +1,3 @@
 EBUILD rubygems-15.ebuild 814 BLAKE2B 9ff9ecfd404eedfb95ed66942f47138be60dfb47fd74c73f4c7075332b45510d5cb4341204420a04ce3a662e505280b7d5120e1056c509a790f59a0cae8babea SHA512 1eb100d94244bdaf539c2e4f066fa126f0cb8d038af7bee10147215bfddd051e347a7ad8bdf91672b445cc4978aad534f8c2203ac2d8b6f2461fd266d4abe852
+EBUILD rubygems-16.ebuild 905 BLAKE2B d4fa2c115818657e026abf05bc93df05d1fcf66b8ac1700847bf5f31d1adccfb6534e17ae18f0b1369c972224cc861201a5009fec1fa88af1b15b51d798f36ba SHA512 44c9ff26a965cb2bc302cd50cd08ba26dbda6b5869fae139916f96d6af96bd996f66eb043d95416e0f24fd3e9aaa414a51adbbe7f507fe8fa435cc6209c6660d
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/virtual/rubygems/rubygems-16.ebuild b/virtual/rubygems/rubygems-16.ebuild
new file mode 100644
index 000000000000..378e392b598c
--- /dev/null
+++ b/virtual/rubygems/rubygems-16.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit ruby-ng
+
+DESCRIPTION="Virtual ebuild for rubygems"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	ruby_targets_ruby24? ( >=dev-ruby/rubygems-2.6.11[ruby_targets_ruby24] )
+	ruby_targets_ruby25? ( >=dev-ruby/rubygems-2.7.3[ruby_targets_ruby25] )
+	ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[ruby_targets_ruby26] )
+	ruby_targets_ruby27? ( >=dev-ruby/rubygems-3.1.0[ruby_targets_ruby27] )"
+
+pkg_setup() { :; }
+src_unpack() { :; }
+src_prepare() { eapply_user; }
+src_compile() { :; }
+src_install() { :; }
+pkg_preinst() { :; }
+pkg_postinst() { :; }
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 21cec867180e..e10f70d3e866 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,7 +1,5 @@
-EBUILD rust-1.34.2.ebuild 318 BLAKE2B 484372f5834a46bc23531352da32675c0e08079b33cb279ac96e023deb60674a382193a9512f448171970ffbdfd231e076c4c3e12d39f8d8ea7eebfe0d976355 SHA512 fcf10682c7f4aca57f84a6abbd70d498a6759d17bf6d2861f2153126aa4aca5d9f636799df60b6f4fb42e0993350a09dd7de66c03ca2365cf3abb3a877e00855
-EBUILD rust-1.35.0.ebuild 319 BLAKE2B e89cbce85745bbeac3ac5ef4b944de4e4799aef0f1ffa647f05bdcd1b6f6a3dd25ecb7ceee86537f396c44fcf7823a63996d1939fb3ae4a172effa092431f660 SHA512 80d33e755c9a597264680b2f6f9642ce0de57af355c93cd17df317edfd17b437aea45b33e0a60f0f4bc5387eb1300ea00ba9b65b260b8e4823654dcd4515cd64
-EBUILD rust-1.36.0.ebuild 320 BLAKE2B b1e807e0cbc7c4fda2e9ad8597c5d83009193cec9f130493998d0c5e3b267b342fe7d188ec7a5fa63b323916c40154f1273e9447b30f4dbc4385a58f271387e3 SHA512 9bed0818497d426fb37b2643cb4d876f1f918eaf7bfb90a2e17b11e276c4b06704dbc393590b2d1adf163b7110e9fb3f27e87ff325aaa34e08327c787f5d4b08
 EBUILD rust-1.37.0.ebuild 316 BLAKE2B d48df8174737c102b070bc33ba20524dd6726338d336d01d4f9373625ae8d2d15cecc58592f27554f7e829aa65caa56b1f4c1c55b256d2bdcdeefaf8233f8422 SHA512 1cd46a826faaabc8c86e627d6543687f6d6bfe407cf32a71d4bee2c873958b927abce86c67cab694f91a39fe6375d2fe41154e60042e5a79ee9dd0fafb1a4bd2
-EBUILD rust-1.38.0.ebuild 320 BLAKE2B b1e807e0cbc7c4fda2e9ad8597c5d83009193cec9f130493998d0c5e3b267b342fe7d188ec7a5fa63b323916c40154f1273e9447b30f4dbc4385a58f271387e3 SHA512 9bed0818497d426fb37b2643cb4d876f1f918eaf7bfb90a2e17b11e276c4b06704dbc393590b2d1adf163b7110e9fb3f27e87ff325aaa34e08327c787f5d4b08
+EBUILD rust-1.38.0.ebuild 325 BLAKE2B 1c5a5504f35206e4104be8909b17b53ef4a6d4359f6e5c683585fdea34e7d6079c21b0416f6f869124ec22c131f6d55f8e86d8eadbe8237fbff844bdb97f211a SHA512 34b418ba52ae6092efbb1f9d680ff745141879dff9e7f314b4f8b4074da10f8130715beecf078d69553384e893979d1234d2c762c9c70ba9a85dbe15f182485e
 EBUILD rust-1.39.0.ebuild 320 BLAKE2B b1e807e0cbc7c4fda2e9ad8597c5d83009193cec9f130493998d0c5e3b267b342fe7d188ec7a5fa63b323916c40154f1273e9447b30f4dbc4385a58f271387e3 SHA512 9bed0818497d426fb37b2643cb4d876f1f918eaf7bfb90a2e17b11e276c4b06704dbc393590b2d1adf163b7110e9fb3f27e87ff325aaa34e08327c787f5d4b08
+EBUILD rust-1.40.0.ebuild 346 BLAKE2B 01addf34165dd3a8c4eb32c442ec1d578b5958f4d8e4c8edf6a1840ee811139cca582392e1207fd020f9cc663c0cfbd683994c7804685108679d67355c8a23dd SHA512 256aa722975cfac02f378f294cc31a45b0dd7de06321a179d5e55db92ec5d3443c4c4c1af5ebd93e4f00ade0192224fa6e5e75ad15c5b01e60b91facc9bdee17
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/rust-1.35.0.ebuild b/virtual/rust/rust-1.35.0.ebuild
deleted file mode 100644
index 1ba2f337c1e9..000000000000
--- a/virtual/rust/rust-1.35.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.36.0.ebuild b/virtual/rust/rust-1.36.0.ebuild
deleted file mode 100644
index 75f822399482..000000000000
--- a/virtual/rust/rust-1.36.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.38.0.ebuild b/virtual/rust/rust-1.38.0.ebuild
index 75f822399482..7e7cb0cb6fa2 100644
--- a/virtual/rust/rust-1.38.0.ebuild
+++ b/virtual/rust/rust-1.38.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 BDEPEND=""
 RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.34.2.ebuild b/virtual/rust/rust-1.40.0.ebuild
index 2294f68c0624..a267eb017c2d 100644
--- a/virtual/rust/rust-1.34.2.ebuild
+++ b/virtual/rust/rust-1.40.0.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
+inherit multilib-build
+
 DESCRIPTION="Virtual for Rust language compiler"
-HOMEPAGE=""
-SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 BDEPEND=""
-RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
+RDEPEND="|| ( =dev-lang/rust-${PV}*[${MULTILIB_USEDEP}] =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/wine/Manifest b/virtual/wine/Manifest
index d5c8cc36c05b..564e1b852b98 100644
--- a/virtual/wine/Manifest
+++ b/virtual/wine/Manifest
@@ -1,4 +1,2 @@
-EBUILD wine-0-r5.ebuild 1011 BLAKE2B f3a67828edf578b1bb9c2f5b6f5ed387123419fd390b6da4f99323dce8c7512d008be77d7270b420c9b3264db097868403f36d58e38876eab851fc977497f622 SHA512 8c86b3059e6d33b971aaef192b4adf9516a1edb3faf60f311b57180720874fbb188133b1a585355507a6c2e5e5e5552a8996a0281acc2d796bcbb85e588b4d5e
-EBUILD wine-0-r6.ebuild 923 BLAKE2B 5bfca554416fc7b46b34a4a8ac789af7183177efc03ce52292a97f25b80d83b14d1a70df28facbb36ac87ff1d2b7264e309347d5af010b50890e50a15be32c09 SHA512 579bf05c33864078a04584bbfe4f8ce23ed47297434c7e6f503cd7515a907889704f41751f369a399ee41312cf669a86e545dc170c775856e73910b0d2aeec42
-EBUILD wine-0-r7.ebuild 788 BLAKE2B ea1bdf23acb8d1af4e4caa1cbe096f243e2fbd7336a4ccc2b97d25b08ab48ebfcf9ca0b3af63d0a9ef88c56519ca1873d21944da6b5e514a1f43d6ea7c817fa9 SHA512 6e8dabe31a7f323c20abd028933d54fbaf2e07a5abe87938cdbd8f1df5517d4143006ef36291456a65c46344de3efa04e7200e6959b14bdeddd717d7293316be
-MISC metadata.xml 588 BLAKE2B 2aa8c20868c11eda5c3365bd0f5f320d9d13bb9cf2681949bc6853534abf2178bda5d325ba55242ea1b8bfbed4daf9f0e360d29510e4f5d76d62be4aefcb48b3 SHA512 fb7933567b68997f1ca8e78a36a63fb2f956d452c6fbd5376f8a335653fef3bafe722960d5c954fee3d8a061774c8bdf93c39f8c786c3bb9ab7152d8031588a7
+EBUILD wine-0-r7.ebuild 786 BLAKE2B f001da539be2b56d39d06b825c691f5de07c0d7468e059b3fc1fb54f4580a50f749b82306fe5b696e2e0b7009fbd278a9a4756d19c1d6f9a38e10020e9586500 SHA512 433b8fb67d592384a933b2c5f35f2185a2c3e69e1d77a320d7879071e02f73ca430c3b5f24ea769a43a30f5539b99b61a7b225f0b9abccafd026a66dde26d1d8
+MISC metadata.xml 525 BLAKE2B 7ef7d5b7c92c557305d4f0edb1661ca4557dfda6c348b478620417812c0129c3589eabf150f4ff6839ce17f7d18525835524e3663b58de4244c55a35c411b8d6 SHA512 3288a91e913c956646b5787af3b9dbfa293709cddd77009d3ae8a82da56b371098c8904e72d3b0ddea7f4b110375cb3f033c409368f12fe1d4fddfb2f3149e63
diff --git a/virtual/wine/metadata.xml b/virtual/wine/metadata.xml
index de062ba7a89a..7c40dfd6a6bd 100644
--- a/virtual/wine/metadata.xml
+++ b/virtual/wine/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Wine</name>
 	</maintainer>
 	<use>
-		<flag name="d3d9">Enable Ixit's Gallium Nine Patchset</flag>
 		<flag name="staging">Enable Wine-Staging's Patchset</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/virtual/wine/wine-0-r5.ebuild b/virtual/wine/wine-0-r5.ebuild
deleted file mode 100644
index 5ffa6e838918..000000000000
--- a/virtual/wine/wine-0-r5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for Wine that supports multiple variants and slotting"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+abi_x86_32 +abi_x86_64 d3d9 staging"
-
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
-
-# Note, the ordering here is intentional, to take advantage of the short-circuit
-# logic of portage, to enforce wine-vanilla as default for new users.  The idea
-# behind this is that some USE flags may pull in 3rd-party patchsets, so default
-# of vanilla prevents that.
-RDEPEND="
-	staging? ( || (
-		app-emulation/wine-staging[staging]
-		app-emulation/wine-any[staging]
-	) )
-	d3d9? ( || (
-		app-emulation/wine-d3d9[d3d9]
-		app-emulation/wine-any[d3d9]
-	) )
-	|| (
-		app-emulation/wine-vanilla[abi_x86_32=,abi_x86_64=]
-		app-emulation/wine-staging[abi_x86_32=,abi_x86_64=]
-		app-emulation/wine-d3d9[abi_x86_32=,abi_x86_64=]
-		app-emulation/wine-any[abi_x86_32=,abi_x86_64=]
-	)
-	!app-emulation/wine:0"
diff --git a/virtual/wine/wine-0-r6.ebuild b/virtual/wine/wine-0-r6.ebuild
deleted file mode 100644
index ce5b0f83df02..000000000000
--- a/virtual/wine/wine-0-r6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for Wine that supports multiple variants and slotting"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+abi_x86_32 +abi_x86_64 staging"
-
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
-
-# Note, the ordering here is intentional, to take advantage of the short-circuit
-# logic of portage, to enforce wine-vanilla as default for new users.  The idea
-# behind this is that some USE flags may pull in 3rd-party patchsets, so default
-# of vanilla prevents that.
-RDEPEND="
-	staging? ( || (
-		app-emulation/wine-staging[staging]
-		app-emulation/wine-any[staging]
-	) )
-	|| (
-		app-emulation/wine-vanilla[abi_x86_32=,abi_x86_64=]
-		app-emulation/wine-staging[abi_x86_32=,abi_x86_64=]
-		app-emulation/wine-d3d9[abi_x86_32=,abi_x86_64=]
-		app-emulation/wine-any[abi_x86_32=,abi_x86_64=]
-	)
-	!app-emulation/wine:0"
diff --git a/virtual/wine/wine-0-r7.ebuild b/virtual/wine/wine-0-r7.ebuild
index c169693fcdbb..18cacfaec222 100644
--- a/virtual/wine/wine-0-r7.ebuild
+++ b/virtual/wine/wine-0-r7.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for Wine that supports multiple variants and slotting"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+abi_x86_32 +abi_x86_64 staging"
 
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
diff --git a/virtual/wireguard/Manifest b/virtual/wireguard/Manifest
new file mode 100644
index 000000000000..9e812fbf8118
--- /dev/null
+++ b/virtual/wireguard/Manifest
@@ -0,0 +1,2 @@
+EBUILD wireguard-1.ebuild 921 BLAKE2B af41757e408eeed96f84285056e98e32996daeee7099f94b10bce6ae52b570f434ea2fb2a2fca1e2b1a2e8f15a0b32d9e03f39a6a49cbe8ca442bfd438fb4f8a SHA512 0c42159a3bab1443c7ae433d183910148cfa4e53349ab45dc71cdb565f816435f2a004ba5fc66ffa966348b44cb63f0f6e53e88bf09903d8e50e6fd0c0ef94db
+MISC metadata.xml 519 BLAKE2B 658024ee6de411e6c8248892b40c1049c574320ce42fa0950020465b04647045e59b459d2edae210ca75c5090b2867fa2ffedfde5e1fd3e004ee65b69e73b40a SHA512 fbff412fd91543d8ff53f2f28558e77e3ea7b569593e7a8d158e6056fce18627f1a5d3004f9ae67aface12ddf02a821938869ebab24fa850cf5f33fa9db6db4b
diff --git a/virtual/wireguard/metadata.xml b/virtual/wireguard/metadata.xml
new file mode 100644
index 000000000000..a2b169f1920c
--- /dev/null
+++ b/virtual/wireguard/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Compile the wg(8) tool and related helpers. You probably want this enabled.</flag>
+		<flag name="module">Compile the actual WireGuard kernel module. Most certainly you want this enabled, unless you're doing something strange.</flag>
+	</use>
+</pkgmetadata>
diff --git a/virtual/wireguard/wireguard-1.ebuild b/virtual/wireguard/wireguard-1.ebuild
new file mode 100644
index 000000000000..4fa639117c92
--- /dev/null
+++ b/virtual/wireguard/wireguard-1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography."
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+module +tools"
+
+RDEPEND="
+	tools? ( net-vpn/wireguard-tools )
+	module? ( net-vpn/wireguard-modules )
+"
+
+pkg_postinst() {
+	ewarn
+	ewarn "This package, ${CATEGORY}/${PN}, has been deprecated, in favor of explicitly"
+	ewarn "merging the tools and the modules separately. You may accomplish this by"
+	ewarn "running:"
+	ewarn
+	ewarn "    emerge -nO net-vpn/wireguard-tools net-vpn/wireguard-modules"
+	ewarn "    emerge -C virtual/wireguard"
+	ewarn
+	ewarn "When Linux 5.6 comes out, net-vpn/wireguard-modules itself will be deprecated,"
+	ewarn "with its functionality having moved directly into Linux."
+	ewarn
+}