gentoo resync : 22.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-22 18:41:30 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-22 18:41:30 +0000
commit: 580f05ea8f512d11e23e8da80177d27835cbdbbc (patch)
tree: 48f1c956bdc671653181038c8d67d35bc8569d41
parent: f29eb0598f62fc3b5f09f2de5a89c0437c6164d9 (diff)
419 files changed, 937 insertions, 4572 deletions
diff --git a/Manifest b/Manifest
index bde54cb2c2b8..5298f290416c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29481 BLAKE2B 65348db9cd685281c9585bcf79548d6ab6044d9601d341e6755c63933558217f0077db301b9049ed2288a31e50016378115ee87f7edb75291da3f1c9b729bf4c SHA512 8b4fae08e43c03bb70dded951a479c4814356d3a7d15e35a6f8ee6817251cd796db8b290d7dddfebd9f52e4e8dc93e82960afe4e21b4aeabbf6d5544d59b4474
-TIMESTAMP 2020-01-21T18:09:00Z
+MANIFEST Manifest.files.gz 29489 BLAKE2B adda0d0da5980fde65e9fc1ac443e4be319de3274c8713219ff01b6a932a34ea5ccbcf937080e5af34aa3594045abad3c5d0ed25268fa6cbc763a16a918dc28c SHA512 cf5f2ccdfe2d85796f9fa1bf5f4eb71833e8b32ee91e73d9765a6546c28b6d60decb39303268729fc6a91849e1e7a0b012c943aa19a1d466f2fa1e36b981a3f9
+TIMESTAMP 2020-01-22T17:38:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl4nPjxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl4oiLNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDg1w//ZnSyhe5bS9QF2l9Ohi/Wu+npDr5UBON4/cmA/xnGdeHUiv3MjEpOj4SE
-6R/sVNQO8P65lhVIo1jkhsUech6Xtytd3Cf1BHmXjkC44wEfzTKMJ6tFEqTMNr52
-HBx5RqWkFvYofpUHEVJLMEtiPJdKCBj48J1+ADM7XaunmfnrMVYvUHJlg1avRJ9+
-bbKHa/l0fF9x2cnXCAKLJotmzcaIOzxtbTH0IFydX26/5oFQco8LkbhVRHmMXRO6
-JyLNOFxpHlMLn6yJqdJJUXd0JbinxBbDIcKJ1eGcW0lI3m2a+oF7HlBPDicxdi1z
-Ah661zxDgpllrDo6gT0xvgX+7SaJNRnwdwKKS0TCXrmjIhgSpWhlTSb5uzkA0KSL
-usB0xcH3vSzYg4SB8zxMUoyRcmhyIqKnMnFStbpgYlaZl567j5pXC1W4qCOK81Wq
-1KSBbppw5lNwiKTwL4AOPMMHwIUmCCWH2LdID07Nd5deYg2CySjAE5QEdL7TuDzp
-gIt3pXF3KcIcgKW1kh5OjSqPlXRr8XkC78NDxEytdxZ09yBpn4xkty8o3+C/V+yy
-pRprJPdq6hlfrGvCiGLhZk0Rl78lkyQeVC//QGyfEOutnNFsB0m8bSyxio2oDYJS
-FwneRj9wUiW7+G4vrAGqyKrNibFCbj64HbLqptZ934b/2WrWRhY=
-=FT+T
+klDKdg/+NbgH9RKlv24amU/mAWdm9b0EfF7EMvR3g0Nv0PkmaPmfdxzky6Uyt1ti
+Q6F3mfnMD2F8Ey8bIGe+mm53OcsANMPa/Pw7o2r6tgmgdaQxbYOhjXVv82D064a2
+CQyhbCvdsR//zi5PxsvGPpCh1lN8ES7tICdTfdISE9LLUTLrNWXFoocheCgJEaGZ
+l5860QX8UmojApXEi/RCxv9zAa4rgrq/rh2apczmzMoq/ZrO4KWsVG38rGkIfPOB
+b9k62K5FHC2j+HZ0lNX02rqZtYZ4oPbtN7CtR/iac8cHUqS66Bo93fd56g7PXvLE
+mTxwpi+PhWS+UlsNAotPLQXvElFjo12YlpFbaEYOBlw2P7PBKKDS1t0qJjCRHlET
+AE8YFZ3c8vW3PHHDYTYh7mk76WkKQbRSwKNdyoQbmi6kjQeoH5pYFbq9PdgG3zwl
+zkV9uIknb1cyk8mcZ5FSuzxrsFudBCmKJSsTpoLWh7svHcYwdYPgVxhnZvQhDWy1
+2Gm3rXDTpPBwAywLxLNaMEL3g73umcdFj+irc2MyrfUOer6O4q21p7yHJy9jjlxs
+xZfn99RFBFB3FJCdt51JUrX6vH7iD1WANkJ6OF/a4OO+QhVoUL1nuV5C5U35gs2+
+9CveW+xsMgcsp6rF6wzpI/zuAPkpzBxXq2zf0DOEQVmHPMQt54o=
+=WXBo
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 9633742b3840..c502fbed6705 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index f0319a507219..bda714c77259 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index f9a48fc6bba7..a2e6aaffa305 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index fbe141712f43..e47ca8a29495 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest
index 62248b8a6b10..0786046e7893 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,3 +1,3 @@
-DIST edbrowse-3.7.4.tar.gz 765794 BLAKE2B 5d428ca3923e26d5b3f204d5aba37a08bbfc50345b18718e5a281521361da4920ea12d68a5013bb688e95f178be8903bede1bef5b3cd626a0e6084141188d878 SHA512 79b2b450b6f54f3d74b7c722f223b3340b3ddfa1cbff2d69adcd1cd4ffb76b78a812a35a053cf224a74543020ef8423cd68eafa9a277451245d383065fb1595d
-EBUILD edbrowse-3.7.4.ebuild 837 BLAKE2B df4e7ed881a1696970d42c70681b228c11c1ba1753974618fdf791c0719e3b247c7f97510ca67f9fe71eae20c488bdfb45f1f03402196dadd210d47bc3dbdf91 SHA512 0365d6bac31694e6d5a60609a61021ae1358450574659074f0c8a0e730fb2e3e92606f91656826eedf75e5875261b235c6b4cff5517913f88ec0c002216ccf6d
+DIST edbrowse-3.7.5.1.tar.gz 790742 BLAKE2B 7047cc2b1c7bc51aaa88f7a6aa981020ae80b6498bcb97f670646267dab94bab565b9ecc23c36f75d2653175917720dbb9e40a0f9bfd44251716669155e8de9e SHA512 ec217bf98334e8b493a1a80082cebfb11da9fa84d20d8b5f3f3286a78ae1dc6a2731c578d000f9f0f19d3dcbec9aa2c3e2a6b5b35f7ea7672840b9bcd1c5c67a
+EBUILD edbrowse-3.7.5.1.ebuild 837 BLAKE2B 841c6dda711fc2b6dd457d9c20a21f1ac3e3ce7d6ca5d62d21932169f9681aa17efcf02bd52618b82722ed4c5af92c4411ff0d155f4ed9c5eddf47bf688f6e36 SHA512 0bca994871d895f031f02b22a5dec544e3834e2d6d812ac0064b5ecae2c4d84ffd1d04e7e66fb0fe364ce758ddf0bff42659109241c35ba5ef73a6fb27bbc634
 MISC metadata.xml 394 BLAKE2B 6e65f68555af92f50c566ca53dffbb5c4a68bf96e7a6a895adf96be6518b83ce4cfe4a1b0fa6dcd7deabdb26afe67376743518154d18fa0c944d4538840e0b53 SHA512 76561a6366dca32455b5bff45b655fd155199b36a7a3243cb900e80382f64be642c64d6ee9095a0857484eaaca98fde8bd370b164d346d13d8744763d4b5e916
diff --git a/app-accessibility/edbrowse/edbrowse-3.7.4.ebuild b/app-accessibility/edbrowse/edbrowse-3.7.4.ebuild
deleted file mode 100644
index 91fd4cd8a6e6..000000000000
--- a/app-accessibility/edbrowse/edbrowse-3.7.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils
-
-DESCRIPTION="Combination editor, browser, and mail client that is 100% text based"
-HOMEPAGE="http://edbrowse.org"
-SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="odbc"
-
-RDEPEND="
-	app-text/tidy-html5
-	>=net-misc/curl-7.36.0
-	>=dev-libs/libpcre-7.8
-	>=sys-libs/readline-6.0
-	dev-lang/duktape
-	odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${P}:" CMakeLists.txt
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EDBR_ODBC=$(usex odbc)
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 677c13d36975..d7783558e8c2 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/unar/Manifest b/app-arch/unar/Manifest
index 49ea6a263698..fa0da1b7bf8f 100644
--- a/app-arch/unar/Manifest
+++ b/app-arch/unar/Manifest
@@ -1,3 +1,6 @@
+DIST XADMaster-1.10.6.tar.gz 2064628 BLAKE2B 34203e5280a8e450db616849a953eb9f5147c8fe2922fabdcfce8585fd4bbe2c3aad76921368818e546d60d64b9c59de942cb63008edec83efa29ce4f5caae7f SHA512 f6e51943fd3ced9d0a0a2189db0a7a45d7f59e8109e78406b8c434f568fb53d791613e51437996cb1debae7d4490cdfabc9fa1fdfcc621ad97a43770af6b13e8
 DIST unar1.10.1_src.zip 2552535 BLAKE2B 678c90dae6572cf9de6f90d044de650d82293df3918eb298de27fe5a557efdda1c1da284c6829c667bb2812033627fcb1a31bf22318d277e9467ca965435f6b2 SHA512 2755f1e2dcca68912f748587f195887d785d5c30933ca0d7a7de1dd35c6c1c115571e49f462fe15722e1b34560f02503382727e1df19a1f23d4a3cc75750434e
+DIST universal-detector-1.1.tar.gz 196274 BLAKE2B d84dc1f850031213d88c288341edcbb588197f23ae0d10632ed129e73e4cc2b7670c8c862bba2165fcc7421c265e4dc3e791ea188e3d2b647bd1ab9b428bb866 SHA512 e514670b3d37b2472ed3e9cb0fdc3298a8479772264b7573411f104be554222bec2e01f73e1f35db95620fe785bee2dcf9ddc9c2b1f4ff6b522fa64d14d020f5
 EBUILD unar-1.10.1.ebuild 1182 BLAKE2B 19606fe1687ab46d2080b7441eed97febdba4d99b738e2b2251007d66d94a1d46c5f628ae8c4ef2ec8fdec2e44fefe26c6acc30135fd57af52ce3d00b3821e4e SHA512 2ecbd3d4d8061c2ac9f1f8e3bc0deb978442ebe38d0f9adf35670619f322b754583b292c095a775f0a3e22260a7ca02857e99c6bf1286dac4e6628ef6f07f567
-MISC metadata.xml 248 BLAKE2B 599a4f7a35f351c2eff3a57bc358edd8d6b6f67d5e4449f7d7490f0c099895c4a9a0e9d1a032ba616e97f2ba0961f1e96216f65bce98a9af5ad316f252db4a6e SHA512 86371924ebb7220e7570148b5592414c4f2d34d2f93067943f00cccd9d4b9866b3cbe13a674526e61f929d9a004237fb1ff80c59da2e6a798b2b42393e7f87d5
+EBUILD unar-1.10.6.ebuild 1382 BLAKE2B 0f96855ee431dbdf70c35d09b4243b44681df61f580c1e3c39932475ff06e705a2a20b00e7f5a3da31da72ae4b0f8136798235a2419e1daf7c1d4d3ed5813e7c SHA512 1b71fdcc97e02e49217aa435ee8ff66bb4df0184fc0182082d391883539889c7d3f053c788501f5dc4f08a47a4663af61856f2124d4a9d076c1802470d34961b
+MISC metadata.xml 499 BLAKE2B 421812ffc3267f8786e62b36886bf0364ebffa55568f81d68bdfd32b0e10345b0501aae1a1196e7c91836bdec985b19c664f60c123ea5f42d40402176c31909e SHA512 784d45167cd50ca9bd5b3e0e5a2ec7f4086b3f653ed095f71246cbe7f8aa9515577611030e1d4a868b3cb690385afcd13c4839ca34c70902f9e07132e916e4a9
diff --git a/app-arch/unar/metadata.xml b/app-arch/unar/metadata.xml
index a7710862b88e..3d219340e5cb 100644
--- a/app-arch/unar/metadata.xml
+++ b/app-arch/unar/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">MacPaw/XADMaster</remote-id>
-	</upstream>
+    <maintainer type="person">
+        <email>robin@hallabro.nu</email>
+        <name>Robin Hallabro-Kokko</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">MacPaw/XADMaster</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 94347db8db39..5c65ca008664 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index 967155da5cec..d13338ef01eb 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -1,8 +1,9 @@
 AUX hteditor-2.1.0-format-security.patch 1517 BLAKE2B 29ba4d308ac6b03b79f25c1aef38aac224ef936c0ebbb052e8a6238d863da34e575791bbbb6a430ff1e700f0c51f3ac27658646038f76c837a6fa2070d318bda SHA512 71b27c81d421d2ddee2e8ac6fe0d599678686880bebbd15464bee9ce4692f9e36dc1022f055ed6ff544985cdf1ccc496c1729ada193285b345597b5c186f5b5f
+AUX hteditor-2.1.0-gcc-10.patch 989 BLAKE2B f4678cfa1eccc741005d4a51d4c74f4d01c0f62594b1f138121758db26b24c4a588430a43f4cae5d9b6f4032236c4f6478b385542e060c37225859d9cd78ba93 SHA512 2fceb761e1ef4225917a66db2fabac1a38072e83ce0fdfa9bdc592d34f9f7870c2a0aae971a4ebe7baffb52203f6b7b906e57f672925fbaf0c8ca77fcebf1a2d
 AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa3252c4199367904b9d1b937f13d95e36f48a2d5c687d5e3d39edd56fba4fda74190facffbc7a8bc8b8ebfcf0bba9cd820226 SHA512 2bf1b8b6b945f9a153b2ee2afa03facbcebad36405bbe07c16230a2269595836fd802770b9209ce8a018195d77be553817352d99da6acdf0e7d8989a4ce09431
 AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9
 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
 DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410
-EBUILD hteditor-2.1.0-r1.ebuild 1219 BLAKE2B 9d8d214caffb1171cd951e2462e003e75eaa1f0e0e76b7b0cf7644197990a9471bb1d4560a99383850ae949391bba24cd57eec3bc961a7154890b42cad355a26 SHA512 0b3bc68e0fd55b6e178299c4541dc87ed073d1c3af6b5186c2f05ab6815bc249cd27c3e2aa387a5277d52cbf1985372d4e4daae22a38f5e45dcafa85a2c00932
+EBUILD hteditor-2.1.0-r1.ebuild 1249 BLAKE2B ff9ac8b1913e12b6cbf1fac05385dec458bf5c2d02d768505d782c736e88a70fcc9d838b718855a040552fff7029f06fd5245d9243cb53ca43aab842df06147b SHA512 84e4e21205388ef1b0282132fdd07a5719dd2562faaec5676ff205ba2a63b995df5f20674267b3565fab6ef77aaf3b93f8a9a07c9a46ebf5b77c53ddbeccae31
 EBUILD hteditor-2.1.0.ebuild 1173 BLAKE2B 4a61d5860885b2ef48f0f21621abea57429dd36ebbba36a6250954785880d8cdfd648a0827756ca38b25b33691fcc64afc06c11e7bf59d8823ac7068befa9d67 SHA512 6022aa8a28461dde621ff2a02695b1aecfb4473bc451a9555350f510773882534e8283e711c69037f1787a77f7483312e7645a0660940d60bb6eb968802bafb5
 MISC metadata.xml 464 BLAKE2B 7fdb5c881881e21f4a74db09bf905c4d0aebdb5077598916186266ca12dca891c1619ce550a37ac3400ef92138ff2521dffd91c25bf254d8e49e0b628ea7ebca SHA512 b08be8368d7459a56096769aec6cdb6607225968b87ac12d22c788081287d16345060f071c09c0d505a8caffcb5de9378328250758b13c9229eb1fc5c10a8388
diff --git a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
index 8798cd47595b..5b468939e1f1 100644
--- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.0-r1.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
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-tinfo.patch
 	"${FILESDIR}"/${P}-gcc-6-uchar.patch
 	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
 )
 
 src_prepare() {
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index e51aabb4d9a1..8fbf66ee59ad 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/ghub/Manifest b/app-emacs/ghub/Manifest
index adf89b808acc..ba70dac57807 100644
--- a/app-emacs/ghub/Manifest
+++ b/app-emacs/ghub/Manifest
@@ -1,6 +1,8 @@
 AUX 50ghub-gentoo.el 124 BLAKE2B 84170098bd01bb9f165eaf06f7cb21c56d2caaf964d2658520311757845d053072a7704fcb90cce2a2dfbd2385f357d2e7569061ebe0ca41b575efd752d29fd8 SHA512 596c7e75560f3734b57525bdfb42f3985fb49ab4d86637231361f6673d2431c0a6e73f91f58f003f9027f1143b9be3f4330ef2e1ff6c627ca6057256f4afbfca
 DIST ghub-2.0.1.tar.gz 50014 BLAKE2B 449c12b4a75b8de75249fa8f3fd624551d36ae745325fe62b20d8a68a6bad565a308e8c9be6d742c24fff5238fe2cd56fda9d8353465dec28e0f42b2ee10dc77 SHA512 d27b3f150b1b871dd31746ee7396b7bea544a6209f73039fa0ac6b670e3fcdbddc2f888cfa3dfe89b64325d208f5fe18ad90869e012758dea54878d0dcc82528
 DIST ghub-3.2.0.tar.gz 65346 BLAKE2B c3aa5195a574de870fcd757bf4efb4aaca6fd83fc06ede375e76915972686fe50fc8a7fa2ebf6f0e2b8f98b60857d36a7f99997c255dee30db49505ca3e90a30 SHA512 dc5a2807d17c2bf65e55f33ad2d00b459acb0e0033caacd5ac8ab9b15deae607c2c25d83c61626a62f50a09d45dbeb91c66299d725b8c3663a1767fd30c7c1c6
+DIST ghub-3.3.0.tar.gz 67861 BLAKE2B 60006417d24110bdf99eae860b0a639e5757afe0da94b8bb5186d54ee14b360c473acebf667a7a262a1edd581da99f4896814b6ec2c49f8c9dc23b5c5e89d63c SHA512 7071f50d66ffd580d0cbbcdd7a3776fae70f090bb4d970a3b7767b9add3893c8cf286996f70baf4c214a7957fab5504596120305be23dd300c0c4c0fd2f660d6
 EBUILD ghub-2.0.1.ebuild 486 BLAKE2B 697286b9f7ae81e6f466208b636c339b718ca7e907350a0c76f9c87110632c20081f1dae994ccd31883d83c91bec1467a7d90130efb7fe09a2b71627e6304145 SHA512 fc9168ee1891f953bd5cd90c32e12f7a1146b53aec7f5c2e7ba32b21d44616aabfc8f075e7089575c7f60a4a88d84d04b112db470a3ad3d030cb6a41c7dbc66d
 EBUILD ghub-3.2.0.ebuild 594 BLAKE2B 525b954b0ed721868b8c103904d51af3cc58dd79be779369e51e583902325b6941d76624c51818f3f1eaee72665e8a00aad2c190276c4efeae5fa328cefedf94 SHA512 89ab29b8e2b87ca07d4012ed4be91a6e73ac6a01ee42d4a66bddeb86b8a5568e43f273febac5c585e9259ce7060da72ad3569ee3a38094ce6d7f92b290208310
+EBUILD ghub-3.3.0.ebuild 544 BLAKE2B d287f40bf4c9d6fcfe2de2c559aa41d215fb5263c101890f06e399a7600e7b457f027d0a2bf3957e4913fa938afbf8bb23f4d16cf37bc13ae1fd4c584ee6eb64 SHA512 d8fc2184ff80159745225f31b1f207dd07cad9c818cf589882ac7e804a48785431907cf3f4f445d6124e7688cfc8ddcac01c0587c41c75bad5aa079093820c52
 MISC metadata.xml 1296 BLAKE2B b58f88e8262157cef344eb119a5f3c265105c1f90ccfd40192a197b19ab911e086f00e259e2de5f14d8f02918e5e5516568cd95c4a0a2719dd3c7a235c52d38a SHA512 8e9fc9e9112bbc0d069978583e625909c12e3ea03d747fa3189c34ec35113d1d688fee50d0c0983c0eaef5eb884947132b5317d11b89c8f994efec4fef5abe33
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 1d80387a0a19..02c1f14769ba 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index a1321eb77a8b..714b9c90371d 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,16 +1,16 @@
 DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
 DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf
-DIST wine-4.18.tar.xz 22263936 BLAKE2B 710d6d90ff1ef9adeb5bb9012c8f354985c1610f46607a144ef12499571373563f8ce204dc3dbed975a9ab47e0b07e65f8fe0ff3e38a698076d95c58fc0797c4 SHA512 794802289fa021092a86c939a3618563ad1523689cdafb6fd58aed06c6a5c867fc5ef0d3dbb2435a65c3eb0d3b982b37e983257a7a7d20c3b6d71df9bf5bf1f1
 DIST wine-4.19.tar.xz 22283616 BLAKE2B 0d648d931737bc381bca3ad0fa2bfcc089c8324c47c80bdaa85aaddb5a63f5145ef5cc442da299591edbd1723ff1dd49fbf629363ec5e4c6152b7016aed612f3 SHA512 a86bd7ccfb1878445ea946e4ca72769c10b4d966bcc893536a8c3eaa29484ba687dc3a44755ec92a2ad6073e736985b814c0c682bf4f90b5ffe2bca0ebbf4b25
 DIST wine-4.20.tar.xz 22314856 BLAKE2B c3734029583bf17929a92475f4ad3ac97df632d967b9f7fc2d9f076a7f8492ec144b41227812271703ee665a6a17e9b1e3eed6697d5f7394824d3783fcd8de5a SHA512 c01af88106b8a808fbceb6ace45882c300656a47913142ba7052283b358d6d5b4379895804e15a2ca1870a4e955ea3ca857ec042a8070ea4ffaefa0c7a84e701
 DIST wine-4.21.tar.xz 22395844 BLAKE2B 1b9c1fd8f4a1ff0527b4d4a02b1dfffa4f6887f2f261b7d4b5afa12e65a8ea18f544c91397cfc71039db7736d33cd0219aaab82cc4564ecd0cb9c74a2e39d6e5 SHA512 f962e47577db2de4e74022b8d51e81e30a004f98b37d8eee5889334271f013123e3ff53e5ac1416c2dd93ec90bee8a2d300b3842c20124df99ef067ac5c72f53
-DIST wine-staging-4.18.tar.gz 9917480 BLAKE2B 477da02f5177e7efad33ca30267b2a8755c493972c2ff4ebec32275b699a4c08fd9d4b72181f8ad87c58b1c120b7a7b47951057db36963bcd161afe10b1a89aa SHA512 e5ddb7ac09322b5f2c8e8facff9639699a6a3e72a96f4028e88e23e81f73c766bde1479e54a9a80bd7f33c7747a8220e2699f4dcfe55117b9832ff4cdba60a04
+DIST wine-5.0.tar.xz 22469428 BLAKE2B d26938e707545d31ed932c67eaaa9fd137e42daa6facadeaea2897797ec816658edc1b89c649e0cb5c453ca53ebea5d7156fdd188f1afe2a55ca7834e012e276 SHA512 681de951804c3dd3ae8c677a0ea52d172b04cac58594698b191cd972b25899cd2030d01a25fc2ad2eb6b99976a30319d2bd5ba8b7ff98b1a8b43832fa6514b83
 DIST wine-staging-4.19.tar.gz 9908545 BLAKE2B 36674228de808ac9d1f3f66e9274fd9de68173a6a1acca405eb08836a8a787e4e78465442ef6769c02f8fd2e20c3f059d59a1408ed3a8add8a91a68efd07b7bc SHA512 a47ae16dd39797b54011f942fe7e722897af7ddc0bed2bf2e39c46aecf60a02769f7287609c63b4c0c3f1c8e40172e0cdf3bdb53562a07d7a2b7ac53e570dbdc
 DIST wine-staging-4.20.tar.gz 9899451 BLAKE2B a90a71f8f68874822c7326eb13cd26e66dfce8afc6d8fc60f1cf86a20c1a8074178bbc618b540a4bac5168fb0242a0fe46c9167bab3e587462d78b706eaad15c SHA512 2ce4f6fa83fc275c83bc7f7bbd4b1a4ca65f7e55e16af40958635b8b2efc2b174baa79ed576ed09c4c13b572756fb6262f19281e5b72797c7e0f1f6c4dd1a4ee
 DIST wine-staging-4.21.tar.gz 9904765 BLAKE2B 43f15cd96c7f5ca9cf5aad120c73a3aa534dce33797a4a4e707bea668cfc93e077ad112055dc428263775a30c6447620eed8650a9828ac487bf36c6490a7b73d SHA512 0c6c32f86d252f827ebb8d5df2b046c4f0a49aa7c0ca47939b33844786e561d5f676db1e199ec3cd9969757985f66b865099061f5e77234c3aabd4fd29d3a063
-EBUILD wine-staging-4.18.ebuild 20185 BLAKE2B 026f4177a87d74d44099f8fbb4b12bb00ae84ba09fe27c8c371af4cb74f57b009ff50fc110e4834c2cc1039cccd652feca8607bae87f2fa4c5c4784a642e5907 SHA512 38cbf199cf69ad6eea696944676e6ebac5a8c4deaaa4c2b5f5cfb2c850ca4e3b7fb2a22c1bfba5493edee8b0c0bd8277345b115e9bcefa960b51dea616736b70
+DIST wine-staging-5.0.tar.gz 9942644 BLAKE2B e5d040ae903c6e982c961db1c7c30cfbf7245f00cd0df7c10ceb182c5227f5a555f1a41b24eca982a12b4981edee937cfa5079e6c6fec378d475fca3057cbb7c SHA512 36849fc2c848db9949982619c4544b56468012a1f086cc92eb3e2027377c58c3c24daf508149e0e34a70e6b283edfd80833dc2f346c75f0be69f1fb2c5999cd6
 EBUILD wine-staging-4.19.ebuild 20185 BLAKE2B 026f4177a87d74d44099f8fbb4b12bb00ae84ba09fe27c8c371af4cb74f57b009ff50fc110e4834c2cc1039cccd652feca8607bae87f2fa4c5c4784a642e5907 SHA512 38cbf199cf69ad6eea696944676e6ebac5a8c4deaaa4c2b5f5cfb2c850ca4e3b7fb2a22c1bfba5493edee8b0c0bd8277345b115e9bcefa960b51dea616736b70
 EBUILD wine-staging-4.20.ebuild 20185 BLAKE2B 10e08743d08d98fb2ee5b4aa5afe3eada3c9ad45851cc84108f89a770024206ce1f0da2aac0609089004322cdbe33a94d5707e11be7a5246bd1009b8aeea088f SHA512 2604573ff2f999397d6810e18cb0e224fec38f0124f10025979e090ec0c817b942c71e60b958eabeb312f97db09d18dc2ce66a478ee1cdf9f309fab87117bdfc
 EBUILD wine-staging-4.21.ebuild 20185 BLAKE2B 10e08743d08d98fb2ee5b4aa5afe3eada3c9ad45851cc84108f89a770024206ce1f0da2aac0609089004322cdbe33a94d5707e11be7a5246bd1009b8aeea088f SHA512 2604573ff2f999397d6810e18cb0e224fec38f0124f10025979e090ec0c817b942c71e60b958eabeb312f97db09d18dc2ce66a478ee1cdf9f309fab87117bdfc
-EBUILD wine-staging-9999.ebuild 20185 BLAKE2B 7606545fd86816b2080cd7edc4bb7463a29773b208991dc366f2fbf18b555bffdbeff5078dd109ee5e78bf769ac924b87f3e8359f49f05729b314c093276221e SHA512 a8d9dfcfbe390a4e28aad69dae1d66ed32721e682fb8677755896ab122594672cb9a9fb6f6d696af4eba3d7aba067fcba7b0a1a0450bea20ed4c8c40235b37e7
+EBUILD wine-staging-5.0.ebuild 20185 BLAKE2B 9088f8df81a3816510074cfd474c95730cc594e486d99a6de923ae1e6bade242318e0075d909dc2066857b965de37b3d806e9f646c49d0f8fe919b10a46723ba SHA512 2b19269ba21b6bdcca7bd185a3e5aa4de149deb8625bde56a6f21a8f5bba92790383bb827699e7b12e26cc02475b293e7c73e9af5247ffc4de05fa882f51199f
+EBUILD wine-staging-9999.ebuild 20185 BLAKE2B 9088f8df81a3816510074cfd474c95730cc594e486d99a6de923ae1e6bade242318e0075d909dc2066857b965de37b3d806e9f646c49d0f8fe919b10a46723ba SHA512 2b19269ba21b6bdcca7bd185a3e5aa4de149deb8625bde56a6f21a8f5bba92790383bb827699e7b12e26cc02475b293e7c73e9af5247ffc4de05fa882f51199f
 MISC metadata.xml 3627 BLAKE2B 42dd4bb0f3127c1f7403c62e9999900915d86692e571ad4ecde63362d7327ecdaa5ee3d68206b54ad7bd858ccac9049f5c172fc9faf2cadc6af5209598883bd9 SHA512 02fab3eae9d3eb21fc80c0d4950902aacebf0306b99447906760053247e2b0e5bc407b7ec52a2df46de0d3a96d3f6e543a9e94c7878bda115a13fde1d98955f6
diff --git a/app-emulation/wine-staging/wine-staging-4.18.ebuild b/app-emulation/wine-staging/wine-staging-4.18.ebuild
deleted file mode 100644
index 4376738049f0..000000000000
--- a/app-emulation/wine-staging/wine-staging-4.18.ebuild
+++ /dev/null
@@ -1,617 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20190511"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-else
-	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	pipelight? ( staging )
-	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.3 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	staging? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${pn_live_val} ]]; then
-		if use staging; then
-			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
-			eerror "cannot be used to set the commit. Instead, you may use the"
-			eerror "environment variables:"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-			eerror
-			return 1
-		fi
-	fi
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environment variables:"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-		if use staging; then
-			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
-			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
-				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
-				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-			fi
-		fi
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	if use staging; then
-		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
-		ewarn "Wine bugzilla should explicitly state that staging was used."
-
-		local STAGING_EXCLUDE=""
-		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-
-		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
-		ebegin "Running Wine-Staging patch installer"
-		(
-			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
-			cd "${STAGING_DIR}/patches"
-			source "${STAGING_DIR}/patches/patchinstall.sh"
-		)
-		eend $? || die "Failed to apply Wine-Staging patches"
-	fi
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use staging && myconf+=(
-		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine register --staging ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine deregister --staging ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index e6f10b747502..748e8b7b288b 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index df6e105c5b27..f581636d9031 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -5,17 +5,17 @@ DIST wine-4.0.1.tar.xz 21665840 BLAKE2B b33b5ce8b4624dfbbbf473a88ed8c52d5e53855f
 DIST wine-4.0.2.tar.xz 21668348 BLAKE2B f1aa8ba3add9ae1e6fbb930a0c557c0015a699b21ba9988c6832c9a1b5180f98cbaadc561fbe4a22e97ff78732ee121a14f5a82b0637c71a4856fa5524ff2f5a SHA512 14cb7eeba188562b73125c668f2020e1df6802e486552e422d3aa75b95f6fccedc0f87868f7e58ce71697941ff49757981ec93b9ef288da37ca8570658f194fc
 DIST wine-4.0.3.tar.xz 21680420 BLAKE2B a7caf4b82fa2594f77e31f29b2a3da59c08bb58f213268d61bdf48998345162bc36fbfc24db94d11cb07b6da347b3471e9d8976d9abfa0f76c183c0a519aa73e SHA512 a8fde0bcf600eaec56c3ce58c9aa992386784c85cf1c93aa84d50aff4c842b12a6b099c23391d3ad9a0059f3dc9069c0f8e00fad293305ba8a33afc70bf26e14
 DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
-DIST wine-4.18.tar.xz 22263936 BLAKE2B 710d6d90ff1ef9adeb5bb9012c8f354985c1610f46607a144ef12499571373563f8ce204dc3dbed975a9ab47e0b07e65f8fe0ff3e38a698076d95c58fc0797c4 SHA512 794802289fa021092a86c939a3618563ad1523689cdafb6fd58aed06c6a5c867fc5ef0d3dbb2435a65c3eb0d3b982b37e983257a7a7d20c3b6d71df9bf5bf1f1
 DIST wine-4.19.tar.xz 22283616 BLAKE2B 0d648d931737bc381bca3ad0fa2bfcc089c8324c47c80bdaa85aaddb5a63f5145ef5cc442da299591edbd1723ff1dd49fbf629363ec5e4c6152b7016aed612f3 SHA512 a86bd7ccfb1878445ea946e4ca72769c10b4d966bcc893536a8c3eaa29484ba687dc3a44755ec92a2ad6073e736985b814c0c682bf4f90b5ffe2bca0ebbf4b25
 DIST wine-4.20.tar.xz 22314856 BLAKE2B c3734029583bf17929a92475f4ad3ac97df632d967b9f7fc2d9f076a7f8492ec144b41227812271703ee665a6a17e9b1e3eed6697d5f7394824d3783fcd8de5a SHA512 c01af88106b8a808fbceb6ace45882c300656a47913142ba7052283b358d6d5b4379895804e15a2ca1870a4e955ea3ca857ec042a8070ea4ffaefa0c7a84e701
 DIST wine-4.21.tar.xz 22395844 BLAKE2B 1b9c1fd8f4a1ff0527b4d4a02b1dfffa4f6887f2f261b7d4b5afa12e65a8ea18f544c91397cfc71039db7736d33cd0219aaab82cc4564ecd0cb9c74a2e39d6e5 SHA512 f962e47577db2de4e74022b8d51e81e30a004f98b37d8eee5889334271f013123e3ff53e5ac1416c2dd93ec90bee8a2d300b3842c20124df99ef067ac5c72f53
+DIST wine-5.0.tar.xz 22469428 BLAKE2B d26938e707545d31ed932c67eaaa9fd137e42daa6facadeaea2897797ec816658edc1b89c649e0cb5c453ca53ebea5d7156fdd188f1afe2a55ca7834e012e276 SHA512 681de951804c3dd3ae8c677a0ea52d172b04cac58594698b191cd972b25899cd2030d01a25fc2ad2eb6b99976a30319d2bd5ba8b7ff98b1a8b43832fa6514b83
 EBUILD wine-vanilla-4.0.1.ebuild 17333 BLAKE2B de24979de56828f96c53353f02cc44940e7f524eb76bdf9a832d08e21d04eb8e7f3f5a174f20f04e3dcba24a53414822987805ea046066da05824a04a6aab486 SHA512 f5fde5c2ab86543c9e0dfbec9d1e0234c5b0a0e66cf71201a94c7b7be82062c7b2551d6ab4719f7e371d49d22bdaf2fe02b190d145c79923f3024d28b87e0f97
 EBUILD wine-vanilla-4.0.2.ebuild 17333 BLAKE2B de24979de56828f96c53353f02cc44940e7f524eb76bdf9a832d08e21d04eb8e7f3f5a174f20f04e3dcba24a53414822987805ea046066da05824a04a6aab486 SHA512 f5fde5c2ab86543c9e0dfbec9d1e0234c5b0a0e66cf71201a94c7b7be82062c7b2551d6ab4719f7e371d49d22bdaf2fe02b190d145c79923f3024d28b87e0f97
 EBUILD wine-vanilla-4.0.3.ebuild 17335 BLAKE2B 6c313ee907ba258f737b19a9e2c1ab3bf04555649c558d569d7372170704ce2134b6a9d009cfb0e8040ebaf7d50a68c5e8a44fd109557a0e0d77c8293fa0f8ff SHA512 e8b8fae470d371aae55cd69677dadf14da758443f4be3ca19a9782ae8ec51696a1c7e113be38ffeef3270160d155c383daf6482e283def2ccebb5df0cfd3a803
 EBUILD wine-vanilla-4.0.ebuild 17330 BLAKE2B 1dbe6a5dc59af64bfebf087f84efdcad0a1ad56b3f29e567926d4f036ed36ba53bed1ad5072363cde853b18e1ecc848a2804e716b35e85f0ea04faf7e7306d82 SHA512 5535dd99e33a4895d8e6cc9a42c4fe47ccc69e44ff7270e0ebd89701cee1262a1270d2a781f0ac35ef708d9e1c194c02e43c98b1fec7895bd6f83d4b88c02353
-EBUILD wine-vanilla-4.18.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
 EBUILD wine-vanilla-4.19.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
 EBUILD wine-vanilla-4.20.ebuild 17552 BLAKE2B 49ff2aabb9bb739ab4e407283c567800913cab97e65fac9219c429dca7112e670643f471f92945f0962b1f78c2e50f75dad68ed883070280cb122700ec8b0493 SHA512 13d9f9e437b2bbda1ae93519b3b8421834f3d9eeb4849b4af065ffe391d30ca138eec5c442d199d506b1eb719519746a3e75b71963eb20377925ed5661fb2c1d
 EBUILD wine-vanilla-4.21.ebuild 17552 BLAKE2B 49ff2aabb9bb739ab4e407283c567800913cab97e65fac9219c429dca7112e670643f471f92945f0962b1f78c2e50f75dad68ed883070280cb122700ec8b0493 SHA512 13d9f9e437b2bbda1ae93519b3b8421834f3d9eeb4849b4af065ffe391d30ca138eec5c442d199d506b1eb719519746a3e75b71963eb20377925ed5661fb2c1d
-EBUILD wine-vanilla-9999.ebuild 17552 BLAKE2B d68a8b5969e2e9f70aec031294dbfdcfe6537daaf53ca37cbbc80271199b07c18d9e692b8076c0861253ff1351a43d34602d130b474909755734497f1244da13 SHA512 9e51e5a48ef2ebbec2b8066adf5d40a7f3b71cf1a978d54ff28557da731fb7ca9621f5038fb82266984b120f1f713ca41fdcb586552f95e66921f3791d4944bd
+EBUILD wine-vanilla-5.0.ebuild 17552 BLAKE2B ae6fe0d64f99ba8f2f2d39813cce4524b3020b0deb5a32c2b915d2a130e49f8ee48a35c3ad14ee1ff6a62c243532149398091a61caef4cc924afe8c90675bed7 SHA512 1befd25ecd205f08bb3bc467bdcaadf67733d1bd065537df3e5960188ed45138a32cc5d11da9485b54747633080ff13b725da689da9e7dd9d16c7ab0acb0b849
+EBUILD wine-vanilla-9999.ebuild 17552 BLAKE2B ae6fe0d64f99ba8f2f2d39813cce4524b3020b0deb5a32c2b915d2a130e49f8ee48a35c3ad14ee1ff6a62c243532149398091a61caef4cc924afe8c90675bed7 SHA512 1befd25ecd205f08bb3bc467bdcaadf67733d1bd065537df3e5960188ed45138a32cc5d11da9485b54747633080ff13b725da689da9e7dd9d16c7ab0acb0b849
 MISC metadata.xml 3259 BLAKE2B b750a29db90841c9fa04e19ce9e5811945bb1d1d3b6a3b4a071087bf73f9386706ab28b7af29e7e89afcff2e1b68ca79944546e5f68c0d0f248b95fb1a5ac2fc SHA512 84fb94a9a9e4c9e8bf59391c9c1414e55994f80df0b264fdff77f43defa13ef0becdfc24316ef9eb3d824ea8edca5af3aed0586224a96b25fc3e90d7dfc32394
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.18.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.18.ebuild
deleted file mode 100644
index d502188edebb..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-4.18.ebuild
+++ /dev/null
@@ -1,538 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20190511"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.3 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "EGIT_OVERRIDE_COMMIT_WINE"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index cac165bc0973..b8503f0048f6 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 68bb64e5971d..8b7a257c7083 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index 0e9315247673..371307a48828 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -6,4 +6,4 @@ DIST eselect-php-0.9.5.tar.xz 49732 BLAKE2B 78c2010abcb1c9efd4d5f2f3f934365b3389
 EBUILD eselect-php-0.9.4-r5.ebuild 1357 BLAKE2B 7c1db9e923b00c7b46d4b05dddf63c0128af870c9eee1d2adf522c3f5e1add9e916faadc9fbbb9e72cb81e14e5e681d8337f002901831b6f63bc94b9806a66da SHA512 69854d755224fcc9e53e2b87746c40a29704b12a1657826f4709f49df23b5b4456a23de1f913dcf64b11d5a06ba7ec4e776a78e27f439ec8806bc4868aa3f6cd
 EBUILD eselect-php-0.9.5.ebuild 1370 BLAKE2B 4802bf0f6bce5cf4546eac9bd36aac5acf33ac81adf3b3c6cf4ca49bbf5c5a5366b3be1892f797e74aadb8141d949befc8c4ee6c869f692eccbd7c47e2f545b0 SHA512 726edb855acf8f8021c7ec1383b643f48f24a8c0c2ed4f67ea1604d7166d1f8c9c3ff8bf2ab96a490d31c45105762f36b7aeefb7848065e46709238053e412c6
 EBUILD eselect-php-9999.ebuild 1306 BLAKE2B 45c8551979e6c5cd4623cfbd77aff888462ddd18121892b6891459e2281581382c0c6738370f859f5dbd21fcf7ead4056afd78de587b8387bc79cefd689d88b3 SHA512 9982c8bda294445cf3496da2d58f0126278924165cf66967d31628a2eb907c258e50d460e3c1daf5b9c042386730452d2c02a096d1f45c86d10c6538e8afeec7
-MISC metadata.xml 387 BLAKE2B 956f8e21e799bd346de09b2814c359c3c28a37dcad3bf42a11e58e33acfe26354069fce71e3ecb687dac83e176500c2127cb8dda5651e083e27aad92cb385862 SHA512 80a043e0836a1ac58120f1471e997face2f60117e3a83d490ad259a05cfdc39098c457573e3550c9fc3a7712f28b9faacd427c076e8f46ed3476e42f58f8f1b5
+MISC metadata.xml 517 BLAKE2B b597cb77735fa8a26f686dd357f92977342fe28272aa78471fc184fcffbead1fe64c7f7b90f608a6854ce7a9e7529f6132dba83dc9f368b3cdd6ab6b5db5ff05 SHA512 23e39402a69ee17795f08716462c5ce3a5fd8e5c21a8e39737a803f34edbd2c3d38d7e96931ccedcaded612bec5d9e3fe09004a4def1ee4307a63c3bcf99b89a
diff --git a/app-eselect/eselect-php/metadata.xml b/app-eselect/eselect-php/metadata.xml
index be945bac7771..79146b5aa1a1 100644
--- a/app-eselect/eselect-php/metadata.xml
+++ b/app-eselect/eselect-php/metadata.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<longdescription lang="en">PHP eselect module
-	</longdescription>
-	<use>
-		<flag name="fpm">Enable the FastCGI Process Manager SAPI</flag>
-	</use>
+  <maintainer type="project">
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+  <longdescription lang="en">
+    PHP eselect module
+  </longdescription>
+  <use>
+    <flag name="fpm">Enable the FastCGI Process Manager SAPI</flag>
+  </use>
 </pkgmetadata>
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 532f47c901a4..d4030cf9ad42 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-handwrite/Manifest b/app-i18n/ibus-handwrite/Manifest
index 2a1553938359..8c5bd16cdc05 100644
--- a/app-i18n/ibus-handwrite/Manifest
+++ b/app-i18n/ibus-handwrite/Manifest
@@ -1,7 +1,4 @@
 AUX ibus-handwrite-headers.patch 406 BLAKE2B cb683592e24d58d2fcd4718374e0d5e8cb51c6300f5123a3d9d43c34e24a3f3413dac5b256e6e7fb74494870d449ccc4a22fc5916a27407fe7c11af391ced5b3 SHA512 4629c68451d3b3ede478b03241d58c66f1a94be0caa05b4cf22d0287beb059c807e398457f0aaaccc6d0f85b9cb987153bae213d949e78afc2c66a6880baa7d7
-AUX ibus-handwrite-link.patch 194 BLAKE2B 6a39b000d1ad3b8e8e16acc1f049f493eb302f7154d0007eac40dc707591f7622417eca998d2f1aef3978a5377c25c32c56b9bf6360f83642fb2503a65633063 SHA512 52d376687473a4dac3f679eae8d68d6457669f0587fb9d4a141b40318060acf552c00cff1f048497699f0a7d3f33f2b0271ed727f2c747f5fa7539d2550fd8b1
-DIST ibus-handwrite-2.1.4.tar.bz2 237980 BLAKE2B 7f8fae383a779b2893e5e014b5dcbdcb48a7f541f04e6b829dffd008fa95b73eb3e1af395c29e68a9c80e7cfdc95928f0a360f84df62c1dc06a9431d1dcf4eec SHA512 fca7129edb7433e7ea6df1ce67b3f27285fe102cc029a7a1bdb8ba0402407bd81724d1b14667d342ef41491acff03e9c152b748e4fee5387f315d4673c2964e6
 DIST ibus-handwrite-3.0.0.tar.bz2 239452 BLAKE2B 379b283565efc16c75c1811e096f814a4a0f009ab469a7bc251f34889bd62c7158379a63b71529db942969a3444a6be42f3db3bc5787993f8e15f86a6a7ddb76 SHA512 ed9b2b35919f3e061230c7085c88e5ce80ee978ffa7f8391e74364e8d6152f0d88a08f91ec58b55fc7067e9fe45d03018760ccfca7b026f36211fa344d16c9b1
-EBUILD ibus-handwrite-2.1.4-r1.ebuild 910 BLAKE2B 32ca39689bc0db16936328edc36c82c4fb789f74e6823d2d81ead14c255d17da3ff515dc6c6706a9719027b5806f464ae5f38f304ec849d528778c6436b249cf SHA512 d40ca6abf5ae79c4edf80821c22fc67b834a854e68e0e8019c23a35b0c377061921ef96a919397427fb3e1219a6608b3eb426e3e03704370d04908e1d9e17179
 EBUILD ibus-handwrite-3.0.0.ebuild 772 BLAKE2B dd93f1515adb6c9712ed211344d583f79c42ac1d37252ad1db520225820339df6c13c18e8067616c7606e21180fc024b9d79c8e13682059a31d49e05852d8511 SHA512 bc2206c934b02586f683cf71180edfe15c6e00b2bab9a096fe5c121e681c774d36caee1520209e8d583cf52c07af8941d3b6b135e4c5f6dd85552073bcf798a4
 MISC metadata.xml 334 BLAKE2B 229fb7df1c57b5810055e7a61a05a330eff00738b85c15a0b47b9d8e93a57b420cbe7bac0c163289f59441fd4252bffe7afd4b6451fc68fce18569187ce77fac SHA512 628e07c785b2e40e4885e4b59a8c8f7c264ed651490f7cc4e0ac253c6f263def9aa9fdb8a5edc41e56381335510a654b171ab05ff9b6006f3c4a77a004226227
diff --git a/app-i18n/ibus-handwrite/files/ibus-handwrite-link.patch b/app-i18n/ibus-handwrite/files/ibus-handwrite-link.patch
deleted file mode 100644
index 1d8415fbaf8f..000000000000
--- a/app-i18n/ibus-handwrite/files/ibus-handwrite-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -80,6 +80,8 @@
- 		AM_CONDITIONAL(WITH_ZINNIA,[false])		
- ])
- 
-+AC_CHECK_LIB([m],[atan2])
-+
- # check ibus
- PKG_CHECK_MODULES(IBUS, [
-     ibus-1.0 >= 1.3
diff --git a/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild b/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild
deleted file mode 100644
index 6965a9cf27eb..000000000000
--- a/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="Hand write recognition/input for IBus"
-HOMEPAGE="https://github.com/microcai/ibus-handwrite"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls +zinnia"
-
-RDEPEND="app-i18n/ibus
-	x11-libs/gtk+:2
-	x11-libs/gtkglext
-	nls? ( virtual/libintl )
-	zinnia? (
-		app-i18n/zinnia
-		app-i18n/zinnia-tomoe
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-headers.patch
-	"${FILESDIR}"/${PN}-link.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable zinnia) \
-		$(use_with zinnia zinnia-tomoe "${EPREFIX}"/usr/$(get_libdir)/zinnia/model/tomoe)
-}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index e918fd8601b2..99c2589a4bb8 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 0b1eec7ff01e..f07a4a14552f 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -7,7 +7,7 @@ DIST zsh-5.6.2.tar.xz 3077368 BLAKE2B 8c6ce22436f9f51eff809c779efad02f4a0730b443
 DIST zsh-5.7.1-doc.tar.xz 3062112 BLAKE2B cb67aada97d79b4b5b1116fb0737294785a2a510c2f4396cf77b671b62631e778ee9d57a32dcd257e079a9e4c35acaeeb68c0ec951b6ae8d8d8b647c05ef365c SHA512 e51bc8eb408bcb20bf8a4f0b8588f7803fdd433445efa282f598a3bec4575cba7feaad117cd2d5077f51150bf0ba41a673ffb925ade33c435db498f1d791cc8c
 DIST zsh-5.7.1.tar.xz 3126308 BLAKE2B 4f1aa2d5aea0341ba7839cf05687020889b5ca6879654a376ce838986211af4bddb7ab521a8a35cc06701f730a75a9778c633726b447f31845f5c140ec1e8d80 SHA512 a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0
 EBUILD zsh-5.6.2.ebuild 5796 BLAKE2B 23454fd9fe184d2a52d325f35785f73da3c87aa8016d267458edeae5194bb0e0981b7b6b6e9c815a844cee79e5203ddcb1ff33e926ebcad9eb6b0db5d222d215 SHA512 f7e89fef58005a2e8d51c8b24487557dabde870624fc8e33d8efc2c6b78c0d7e14e523ecf17a4682c3834d855492de98afaf5e3f5cd8107d9a6276dbb5492095
-EBUILD zsh-5.7.1-r1.ebuild 6043 BLAKE2B 7208078e5914b5ceb38225fd57c94d2fd95840d904bc2bfeae053d2fe321cf5e14f0956719e4fc8fccb41444121a04da4c8487ff21f07430013470605846a1fa SHA512 cc53310bbc4d70b5d15e7d1e105400b8284aee19063791e58d43827905d7616af990a3661f059ab9a2b710b6b9346b9c2d807ab9d7bf1bf105bcb7f17e93b5c7
+EBUILD zsh-5.7.1-r1.ebuild 6042 BLAKE2B 64636e84b44364b9cc715ad93d0a18e85f0fa00ba6d84d9974171c1a2354a96e13a13b24bf7e212a38c62b1e6f00cd21311f5a6625ee8f34c38475892b196ba0 SHA512 7d0c7c6663f01073f5b7d5ee675e12748d195f82224b1971766a599163613b252ef46fb31738936a200b38a2b003cfa106cadad8a96ec9aaba59176b644e31a7
 EBUILD zsh-5.7.1.ebuild 5918 BLAKE2B 157c02c1885f49e39ef74ffcb4a8f3725cab0ab3bb909a163da7d4f9987e26c39d6ba63e3456a39deefd84442236498f839f5761c1dc92b53f60c10e38cff863 SHA512 dd61bccc222da83e4b4bb05fcb36aa929068698f7006f9425f90c0800763e1541acfdde472bb9e030d8246548d5ce6a6463445839823576d04df4b264063f973
 EBUILD zsh-9999.ebuild 5988 BLAKE2B 75c08411ac48ed84ff2b2f870ef8b5495cbbfa601039c328c6fff902736876d5c21f2237dbf82f345feec4b03337349bf842fa165ba9f0f31212b1c105ee8d0a SHA512 528ad315f72b5237313d6438da799cbe8288c85e2150a8cdbc7c623b70ad6238f31ae67d212a4ba5e5beb2351e384128f4780700756e30de88bc1355cb5c06e7
 MISC metadata.xml 514 BLAKE2B 63d77a851911c67bbf8bd722cd8a4766bd0ff0184c2cc6bd2629b27186ea1bdba9b15bed73cee6a261ff499a22a9ef9b8582b22b76eb3752709553bf49e92071 SHA512 bb460e1e123c3f9b7bcad9a6abfcd42ac69f9a2071d6b2dcbee968c3fe82b9bb940e28021b1d619642d99fc595f492247b1a97e6ad51133be73bbb5fd997ef0d
diff --git a/app-shells/zsh/zsh-5.7.1-r1.ebuild b/app-shells/zsh/zsh-5.7.1-r1.ebuild
index 2c765f9c6504..10d572f4e759 100644
--- a/app-shells/zsh/zsh-5.7.1-r1.ebuild
+++ b/app-shells/zsh/zsh-5.7.1-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 		https://www.zsh.org/pub/old/${P}.tar.xz
 		mirror://sourceforge/${PN}/${P}.tar.xz
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 475a37de04ad..7b6c3c6e7cc3 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/expander/Manifest b/app-text/expander/Manifest
index 6e1bf1b59299..4b78ee16274e 100644
--- a/app-text/expander/Manifest
+++ b/app-text/expander/Manifest
@@ -1,4 +1,4 @@
 AUX expander-2.0.5-gentoo.patch 1971 BLAKE2B 16459adb991e28472c569ef77bd4f688110e0d2a99970ed65e5332736a1a90a82afa6a04aaec38ba53b16b3303efbe8706324ffe1a37d6b00637550802d23960 SHA512 f81577c3ee11d2e13b59258a59e02a3ec26b265ee2206fde5585f75c21db015907835ade2db88a19ab1afd778a3a7d146d99d1dfb891237d04b2e6a052f49f57
 DIST nedit_expander_kit_2.05.tar.gz 92571 BLAKE2B 0b77640b87372003e873a9e9146aeec82220dfc86b4f6d57220807443c007b6f4f99da8da505d7b6d2f1350150698deed84c8cb710297c6d8646ed192d3ee04a SHA512 a9d5e97db95eec9f98d71360c6af5a6908f31f59221ac1f509ae4f661b0614610b9591b9e2f58bba1175a6b609407d720369ba99cecb5496133d889bf93788ee
-EBUILD expander-2.0.5-r2.ebuild 1094 BLAKE2B a9b380f0fa99cdd32c32423fcfb2fc7a0684e0b92093f39dfe0169093d4eb8ca672cf890841903ad128593a592ed0e4258155c6e984bf0cf6b83297de4970c5e SHA512 1c95a0838980dd94d03257eae7c3c405d3236e0af0b828860a1e9d428788d77beb0add8bbcb8cabed07e7839c164ff44137a189965cd42a0ca1c32fa0620ae01
+EBUILD expander-2.0.5-r2.ebuild 950 BLAKE2B 2e75ea39d52d7518fbb632422083e3f760f8bc5bd1a67a4476aef16c271128c9db793a55abe2999677f085ba236ece498e22fd7fdec526a02bcfa697ffc4d35c SHA512 f1e4f13b0e24ed43fe61eebb6cbd557c3bf369a8baf9a8aba4bb9b55c33052132722a31e9c2e0d94aee8c502ae4118d9aa803c9ce171786cdf4ed272df892b0a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/expander/expander-2.0.5-r2.ebuild b/app-text/expander/expander-2.0.5-r2.ebuild
index 1c4a5c12ffbd..c1ddd2ee423e 100644
--- a/app-text/expander/expander-2.0.5-r2.ebuild
+++ b/app-text/expander/expander-2.0.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Expander is a utility that acts as a filter for text editors"
 HOMEPAGE="http://www.nedit.org"
@@ -12,35 +12,25 @@ SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_compile() {
 	emake -C src CC=$(tc-getCC)
 }
 
 src_install() {
-	cd src
-	dobin expander boxcomment align_columns align_comments where_is
+	dobin src/{expander,boxcomment,align_columns,align_comments,where_is}
 	dosym boxcomment /usr/bin/unboxcomment
 
-	insinto /usr/share/${P}
-	doins "${S}"/service
-	for x in defs macros misc templates ; do
-		insinto /usr/share/${P}/${x}
-		doins "${S}"/${x}/*
-	done
-
-	cd "${S}"/docs
-	doman *.1
+	einstalldocs
+	dodoc USAGE
+	doman docs/*.1
 
-	cd "${S}"
-	dodoc ChangeLog INSTALL README USAGE
+	insinto /usr/share/${P}
+	doins -r service defs macros misc templates
 }
 
 pkg_postinst() {
diff --git a/app-text/flpsed/Manifest b/app-text/flpsed/Manifest
index 307a6b64e6bb..19a250017638 100644
--- a/app-text/flpsed/Manifest
+++ b/app-text/flpsed/Manifest
@@ -1,8 +1,4 @@
 AUX flpsed-0.7.2-desktop.patch 247 BLAKE2B 2b1269b3c3ca1fb451db11f0a0b310ccea40612226227574dd4eab020aff348fcfd8c82f3908b253148a5e5135cd3a29a8306ac480c53e3410f19701290b79ca SHA512 b632a6b4948a12910916ef71a4710dcbabf91fdfbc302e3242d9101310101377023e58a12b24b6139d26fa37261a779db21773a8329e3f74d2e74c5cd1c6190f
-DIST flpsed-0.7.0.tar.gz 119159 BLAKE2B 1a051651d3d4835abea7ef3237340140feba465d9d42009b10fa18ac5aa927efeced7418477e096a9a5722f0e9217ba0546e324402ef5b84892adbba3f258c32 SHA512 0d5112f4e4f4401a1942767d0de1b38cffbc37e0f798b59e9371c37892c6d2e2448146baff2737e416ab9ec5d96963728918d4a49fc059ac1119d8ac946db59e
-DIST flpsed-0.7.2.tar.gz 146678 BLAKE2B 0e42f1e5653e9b372047216119fb7fdaab98ad3710c0ef717352ce23443e38fb23bd86e4c39663cb0fa51f80393d2f956658f825f3926dd12b28521bc2d1a7ba SHA512 d0e2f7d34e48555d74f58e9df16fa6d29e8fda1fb4c6e58ccdda512f25d7f7ee0e3657e11564cdb9dec483c14f42078636430e5ec987165cc7c6c5de8990984d
 DIST flpsed-0.7.3.tar.gz 146788 BLAKE2B 5721d973b1efe02c8c014104d1ed4991dd630a8da86bc191b58df4a7ed469065e37b80248c7a7ab4946e636f869ecbfbfe457ed15a6cc7c4243642a48790ab67 SHA512 b0a8bf2ea08630d280f83f7c32b4574ba4cf7fd989943492e77d1b73c8d83c81a5df40e64bfff744b5518de845eba21119242ff752e16b20816b225ccb7c3321
-EBUILD flpsed-0.7.0.ebuild 428 BLAKE2B 12afd70897560f028048ed7574b37553abc36ddddb1e061b7adb3cb15c661224745ea8e64ae81cf8acc99f53c9659e8d41caa404fdd501c9e7264d638bbfb2c1 SHA512 eff4dfaba72d90281a42f0d1f327ab78024099dcba5713d0c6b6cd52483d1b867e08f2f2a5630aaa2872cfff7fca3d599a5a079be12b1024eb152afa155525d7
-EBUILD flpsed-0.7.2.ebuild 604 BLAKE2B a49ee79aae0237e5aae0a62859004557438eb723ff20c704ba645ddcb6e534f22c51d7e361c6ea212294d492fd0479ed719507fe37950b506965cb6a88b9f4f0 SHA512 a09b7cbf10d1c4b5aed3fba5467fb79d420f61bc779fbf61241492c33b7579fa693113dba336c5a2e8d8f5d2415d2958cb6333f06fbe41e8b51010fa9867b8d5
-EBUILD flpsed-0.7.3.ebuild 611 BLAKE2B 0516ad6f8c37f7076b8c42a22ef53a5ff8d1930ceec0cd29766281ed8cca47f78895d08c195bbbe0a1f77e6cff53c2c255a484d8c0e0160b85f01625b365534e SHA512 5feb11a89d61f3fbb4d273681ac4c0d7fbd4c2fdfc47d0c665e2fda38bbd6bda26e2a7a0b0aae950c7a103ce1d9bbde961749214e291b3c31ce51c0c92b8fbb5
+EBUILD flpsed-0.7.3.ebuild 587 BLAKE2B b80e1ecdfc2850a3bff1c645140fdeb5170696419e646590e91c201191f7d3a07df76bd107af1117e92276529df877dbd01a8c75d9edfe1734fbe20ce50ab4e4 SHA512 4a302416b5cd54eb596199f0d612600fac0294b00a0da0083d3c22cff139f901e149f294e9635fa94da5f31a4c7237e6c48d1f2216e9f9ad1606f1523decdf12
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/flpsed/flpsed-0.7.0.ebuild b/app-text/flpsed/flpsed-0.7.0.ebuild
deleted file mode 100644
index 671e2fb01d23..000000000000
--- a/app-text/flpsed/flpsed-0.7.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Pseudo PostScript editor"
-HOMEPAGE="http://flpsed.org/flpsed.html"
-SRC_URI="http://flpsed.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	>=x11-libs/fltk-1.3.0:1
-	app-text/ghostscript-gpl[X]"
-
-DEPEND="${RDEPEND}"
diff --git a/app-text/flpsed/flpsed-0.7.2.ebuild b/app-text/flpsed/flpsed-0.7.2.ebuild
deleted file mode 100644
index 5e75d7154621..000000000000
--- a/app-text/flpsed/flpsed-0.7.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Pseudo PostScript editor"
-HOMEPAGE="http://flpsed.org/flpsed.html"
-SRC_URI="http://flpsed.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	>=x11-libs/fltk-1.3.0:1
-	app-text/ghostscript-gpl[X]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-desktop.patch
-}
-
-src_install() {
-	default
-
-	doicon ${PN}.png
-	doicon -s scalable ${PN}.svg
-	domenu ${PN}.desktop
-}
diff --git a/app-text/flpsed/flpsed-0.7.3.ebuild b/app-text/flpsed/flpsed-0.7.3.ebuild
index 7e38407047ce..71ddce38048f 100644
--- a/app-text/flpsed/flpsed-0.7.3.ebuild
+++ b/app-text/flpsed/flpsed-0.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils
+inherit desktop
 
 DESCRIPTION="Pseudo PostScript editor"
 HOMEPAGE="http://flpsed.org/flpsed.html"
@@ -11,19 +11,17 @@ SRC_URI="http://flpsed.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXft
 	>=x11-libs/fltk-1.3.0:1
 	app-text/ghostscript-gpl[X]"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.2-desktop.patch
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.7.2-desktop.patch )
 
 src_install() {
 	default
diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest
index 939ca357c8ce..71662c7d280f 100644
--- a/app-text/gocr/Manifest
+++ b/app-text/gocr/Manifest
@@ -1,3 +1,3 @@
 DIST gocr-0.50.tar.gz 419209 BLAKE2B 232fe240d7a559cdd4408a3dba3768818aefbd8b2718c7ae40829d69ab79dd68293eb6adfc52e661f2f6cf1290ae9656c84d9d7a8fc20229c0942a8e18fb3b68 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9
-EBUILD gocr-0.50.ebuild 1199 BLAKE2B ab0670e4b0c0af277050a2cf59cdcc5aedae968f061943bde4c6aeebfc161336c1e83f397f20cb37a1adabccdaa4fe36f27c9dc0cc90dd2b2ac96ccd96e75a53 SHA512 d73b4c9f4ed68f3c1f09ed7f2fe45d296c0a4fc74a29fb728e40090367be214e030e3615e50c91c9bc156d26ea9403624790ab9d71d3a0dcbf4c046c0f410cfe
+EBUILD gocr-0.50.ebuild 1197 BLAKE2B 1d40723a64c90656f5a333d9834824e0a9baa8222a24b2f4042f3497b65ab823d9dd276d3036febb9f6461f4f7d07e25443d6a285cb6f6c2f07b86484ab96c6e SHA512 ee96d72859d2e29ff6b5405f49b5e6c102bd4058d6a38e8f319634012b2b21f64ce3cf314deac831312a6fadde23e55ba88b2ce2868919677a1944ab802371ba
 MISC metadata.xml 323 BLAKE2B bb09f6949d6fdefdb0ff856c96a0ab766e9ef11559aed7bc424b6da8eb226f4f9090b708da8b4ab62a123530201bfe721e5e6b505b5a6f3d5cd40f48941a86d9 SHA512 5b38ff42ca62ce001e5041406a24ccd8bc1c7f33d7a9e1f84ca0d5d48a3ad2f80e74732a846ffb6768709748bd2dca5868f76ab4c1b00f1e75a6f622597858e1
diff --git a/app-text/gocr/gocr-0.50.ebuild b/app-text/gocr/gocr-0.50.ebuild
index d117bc57f841..80528df1f6e7 100644
--- a/app-text/gocr/gocr-0.50.ebuild
+++ b/app-text/gocr/gocr-0.50.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="An OCR (Optical Character Recognition) reader"
 HOMEPAGE="http://jocr.sourceforge.net"
@@ -12,8 +12,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc scanner tk"
 
-DEPEND=">=media-libs/netpbm-9.12
-	doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl )
+DEPEND="
+	>=media-libs/netpbm-9.12
+	doc? (
+		>=media-gfx/transfig-3.2
+		app-text/ghostscript-gpl
+	)
 	tk? ( dev-lang/tk )"
 RDEPEND="${DEPEND}
 	tk? (
@@ -22,24 +26,28 @@ RDEPEND="${DEPEND}
 	)"
 
 src_compile() {
-	local mymakes="src man"
+	local targets=( src man )
+	use doc && targets+=( doc examples )
 
-	use doc && mymakes="${mymakes} doc examples"
-
-	emake ${mymakes}
+	emake "${targets[@]}"
 }
 
 src_install() {
 	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" exec_prefix="${EPREFIX}/usr" install
-	dodoc AUTHORS BUGS CREDITS HISTORY RE* TODO
+	einstalldocs
+	dodoc HISTORY REMARK.txt REVIEW
 
 	# remove the tk frontend if tk is not selected
-	use tk || rm "${ED}"/usr/bin/gocr.tcl
+	if ! use tk; then
+		rm "${ED}"/usr/bin/gocr.tcl || die
+	fi
+
 	# and install the documentation and examples
-	if use doc ; then
+	if use doc; then
 		dodoc doc/gocr.html doc/examples.txt doc/unicode.txt
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/examples/*.{fig,tex,pcx}
+
+		docinto examples
+		dodoc examples/*.{fig,tex,pcx}
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest
index 2192325b307d..f141c8325ebf 100644
--- a/app-text/gv/Manifest
+++ b/app-text/gv/Manifest
@@ -3,5 +3,5 @@ AUX gv_icon.xpm 2837 BLAKE2B d4e15bbf39e183b0093c7f9effa2725e558b6f0fad3d44fc383
 DIST gv-3.7.3.90.tar.gz 757506 BLAKE2B f856d23d3b9b9164db414534dec4b9a1c441a88d644011a46429b29127364fe429fc72ed3ce76d4142106d10c6a5305b81ec22ed353716df1c1a824907f7b191 SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f411dc8c32ab8bbad05a1161e816c50
 DIST gv-3.7.3.tar.gz 754282 BLAKE2B cdc2133e9be41e420401d23ab7691ca27ccbcabbe5c4d2c892f5661b5c47afc1f5b90f9f240a735d33e66813dcdda0a7a5c78580719ad715048fcaf6a2991446 SHA512 0c0339f023896016212bb1b8ef0185689dd669855c060d0491e1ac59c76ca19f3006b1b00b421cb40bb0beba8e2d35dad1da7d856ac9d33440cfbb07ff1e33c3
 EBUILD gv-3.7.3-r1.ebuild 1183 BLAKE2B dbefcf30dd0b7410eface0373aa1864c0589cd6c2c9a4c4bf3e9dd24ff1043cd3ab14191a7ea2fd96c473b0e2f1e858f637c6ac09dcda5cb844e2b448e3dfc40 SHA512 261e7c286d25790b2a1e8076182f2c021aefeb05d42be9302913047a0de78af93d11e362fb3bde4c801cc87f59a47173a08927eaf0b2815577ec44ab731e8234
-EBUILD gv-3.7.3.90.ebuild 1052 BLAKE2B a5dad483860dc130a75211e8febd41522cb7f9a6b3a4dd56eabfc6231683822a7e8829bf1eb5200df3209ed6a2e52f64c5ac93d02f0937c864943ec1f12aba85 SHA512 8f7ae65364aa6a2fe32689a8389c94978da3c1ec7339a74214562ecbba0bbc531db57e9b30c0096a8428d205274c0953118f7b409a66c5e9894ce85628a25e0f
+EBUILD gv-3.7.3.90.ebuild 1062 BLAKE2B 779fab28c23bc1cb4a48a657bbe929ba5c123323039b83d1654ac4b1c6484ea874b7a3ba07b0e5b9ab789e09c20e486eb655d587a9cba23029aa594d4a88945d SHA512 08b5b114166a20c56f78522181ad0e14ff5de1b9ba52b97ea1e3fca1874888a43b569d0035b441454defd05904351f5dc1c74c8d78fe2279671831912d2c040a
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/gv/gv-3.7.3.90.ebuild b/app-text/gv/gv-3.7.3.90.ebuild
index 95b3ac253ccb..9ceecd9b1cb7 100644
--- a/app-text/gv/gv-3.7.3.90.ebuild
+++ b/app-text/gv/gv-3.7.3.90.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
+
+inherit desktop
 
 DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
 HOMEPAGE="https://www.gnu.org/software/gv/"
@@ -14,7 +15,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="xinerama"
 
-RDEPEND="app-text/ghostscript-gpl
+RDEPEND="
+	app-text/ghostscript-gpl
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -25,10 +27,8 @@ RDEPEND="app-text/ghostscript-gpl
 	x11-libs/libXt
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto"
-
-DOCS="AUTHORS ChangeLog NEWS README"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	export ac_cv_lib_Xinerama_main=$(usex xinerama)
@@ -36,7 +36,9 @@ src_configure() {
 }
 
 src_install() {
+	rm README.{I18N,TRANSLATION} || die
 	default
+
 	doicon "${FILESDIR}"/gv_icon.xpm
 	make_desktop_entry gv GhostView gv_icon 'Graphics;Viewer'
 }
diff --git a/app-text/hd2u/Manifest b/app-text/hd2u/Manifest
index f3e0e5d43aff..9b71fb2b77a8 100644
--- a/app-text/hd2u/Manifest
+++ b/app-text/hd2u/Manifest
@@ -1,4 +1,4 @@
 AUX hd2u-1.0.3-build.patch 666 BLAKE2B 14d1e7cbb7c7302ec0aa1354c4d0a493645f8bf4bf9e4c2e2fa2bd61b04e0e7e8f90477deb6a73a1777ff2f12ad13cdd97f604d889778759d7fe21222772eff6 SHA512 934fe3043aceeeee5df7ae5879198d385639f5b489581209c44e7ec91f5d05216424bf5652f557e154a1a442633848ebe1167b61af9c9e374cd30594744f4d7d
 DIST hd2u-1.0.3.tgz 60024 BLAKE2B 9dd57f2e15add3643aa92747836164b18c9c6554c435b718cea6b4e8d1455bbd775f9d4eda0f10a9bfe3ccb5dbd634a99b367ae849bce2145d9b1114400a2b1b SHA512 d354964f0ad5392315767b96438d843a5f1d6afe78da5b0c5ea65a3b0b2a61beabff3ecac89df81b9271a14ca443f23dfffeb51815e02b724ad287e42fc2d6cc
-EBUILD hd2u-1.0.3.ebuild 515 BLAKE2B 4e84e7cdb9f6626cc61397559942ba15505de1ae819ce032c548581a1f271c8015d3feef8fd0840cbe63273df6debd80fa6acfa1a044707824649d19763b9814 SHA512 d0a7153a1d1961c2a1cf31028f300362a5fbaa6959719404c8f5d8cffd0bfdecc2cff47946aacd2a57fad53635532519ae8d09929acf86a654fdd041c32f03b7
+EBUILD hd2u-1.0.3.ebuild 474 BLAKE2B 8fa25cacff5262f171763842396eddd333532cadd9668cff0660a45d4c9b54d551319b3f5cf449f4bc799eeb415cac4dda56bb79ecb2d489679ebc1e26fffb4f SHA512 243201e510563726ea23d743a0c9ff49158ba5fd722856098da4760be368fdba7c3946d12243134185c12451c08e73f65008d52d96ed7790641d5645edd3a041
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-text/hd2u/hd2u-1.0.3.ebuild b/app-text/hd2u/hd2u-1.0.3.ebuild
index af0d97d7f58b..078f52b2e41b 100644
--- a/app-text/hd2u/hd2u-1.0.3.ebuild
+++ b/app-text/hd2u/hd2u-1.0.3.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Dos2Unix like text file converter"
 HOMEPAGE="http://www.megaloman.com/~hany/software/hd2u/"
@@ -12,13 +10,10 @@ SRC_URI="http://www.megaloman.com/~hany/_data/hd2u/${P}.tgz"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
 
 DEPEND="
 	dev-libs/popt"
 RDEPEND="${DEPEND}
 	!app-text/dos2unix"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
diff --git a/app-text/libxmlpatch/Manifest b/app-text/libxmlpatch/Manifest
index 5d8c749a00b8..abea20a6cbe3 100644
--- a/app-text/libxmlpatch/Manifest
+++ b/app-text/libxmlpatch/Manifest
@@ -1,4 +1,4 @@
 AUX libxmlpatch-0.3.3-gentoo.patch 2029 BLAKE2B a2cced2f4a6e8c7ad53420e1c8a6d244cfc808ae398ecd4106b59c0c80c6d3b708a9bd7c6ccddd21f15b5a000faeba4d00d9510ed1eb3b4a44a34cf79e52905d SHA512 076f5ce303fa410ed48828bfd4c9544d4606511597bf39676a899fb577bc4670db83706ef05928d9e49a665089864d6fb2e22321c19217ed341265d57d2c4052
 DIST libxmlpatch-0.3.3.tar.gz 405496 BLAKE2B 57333f62b95be3acc058593ccdb935148217f84acd7b5d431043cf08bc217d04abe650be099a849790400f0153523cea46905e9a12e6a33e80f0e20edc2fd9f3 SHA512 2eb305ddd6aa1778bc9c9e7b8cae5f82ee05c0ed0a47bbb651209c496fff68f4e527b7d6ad1808bc8bf1f72aaa0172a12ddb140622ce87e3cd150a0ec4d35571
-EBUILD libxmlpatch-0.3.3.ebuild 796 BLAKE2B 4dcd48c289c36e72a8d9f4208a4857081ad9d31714a7030716b5661f66422bb40b0fa038d5fe2c318187408816d427d4fd18ea619613d0a1a8f574557e167f26 SHA512 d148276949fe5f8203bd91675421e90dc002af629c81d2299efb6296715872ebcf64299c88f35483508862f1dc50325014c661923ff454893d8a3acf4e73254d
+EBUILD libxmlpatch-0.3.3.ebuild 799 BLAKE2B 61f13e2d328d26c5fd6f4985922776f1e51d041664bbe84083eb1f13b37865dfc236fa24cfdde24ebee5b995f19d3b2b07bc29ada57e39ac56ce892e3b9bb98f SHA512 4b68e1913b044f8945ded7186d63d4e274cb291f46315c3a4fff9fd1efd703d60d3efb9aad797aeec8dedc6e12a85bcc496437f159736203ceb58b3f1ed887b9
 MISC metadata.xml 245 BLAKE2B e5b503817d886ea642301a8fb76459f31236d1496ba03cb467126419460106072424b6da1e1957ffaf977ac05f4c4baacef448cdf86ea4cbd93fdba026d5e8af SHA512 f884111cb1a85bb4e909b8bc6a70ca00e8d69e066fc9ef79ddbf0b3fc277bc8a47ce13bc1b7bd03a4be9bc0a54704440552394f1d1a8c68d0bf9704b8f05769f
diff --git a/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild b/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild
index 51ae4624c90c..d38ce9c286df 100644
--- a/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild
+++ b/app-text/libxmlpatch/libxmlpatch-0.3.3.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=4
+EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="A set of tools to create and apply patch to XML files using XPath"
 HOMEPAGE="http://xmlpatch.sourceforge.net/"
@@ -12,30 +12,33 @@ SRC_URI="mirror://sourceforge/${PN/lib}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test static-libs"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/glib:2
+RDEPEND="
+	dev-libs/glib:2
 	dev-libs/libxml2"
 DEPEND="${RDEPEND}
-	test? ( dev-libs/check )
-	virtual/pkgconfig"
+	test? ( dev-libs/check )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_with test check)
 }
 
-DOCS=( LEGAL_NOTICE README TODO ChangeLog )
-
 src_install() {
 	default
 
-	find "${D}" -name '*.la' -delete
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/mpage/Manifest b/app-text/mpage/Manifest
index a9f6d764cad7..bac5f72f3af7 100644
--- a/app-text/mpage/Manifest
+++ b/app-text/mpage/Manifest
@@ -1,4 +1,5 @@
+AUX mpage-2.5.6-fix-buildsystem.patch 1014 BLAKE2B ef8b13e878060eda2ff5d0de8984bbf0b6bc1f6888e435aead416e2e8eb8eb6c68982fa16f9ec863ce129d8b15697d60f1b9c901ebc962811e285ee1d7965e13 SHA512 d7b9df3250bfe763d72241e83c64b8c220099b9859ce88534162090d8fe18d7583b8f884d31ecff22e2d9da9e6489f6a87802022c8a5d00f2085adbfbdb9e608
 DIST mpage-2.5.6-gentoo-patchset.tar.bz2 12853 BLAKE2B 69adf941b43fdd7c4e43f3c793063f8d4c1d7f5eeed4b4e01cee7c7a7f5b70554cf1d2e4f73278231d5d95b99de7925ca6f355b8933bb5b7ea2d850d802b567c SHA512 2bfbe4689e02fb76af58a6db3415227df38e71b45fcc3d563a12f505fab8ea78de0415c9ac6d7c9b873f23a9f65e1c8f708f902965ab10e18b2a217b67cc5f0d
 DIST mpage-2.5.6.tgz 86748 BLAKE2B 44558be1272c90a83de37bf9854c96dd1f5b9b38d8588bae66adcfdaa938da351f606424f4d9049231bddae2d03ebc632570a7c80a0037ba1536147aa33df872 SHA512 79a51d0fa08848b22f758e8bc3f57680d33492d261a0061c6cce002c3cb5f129a78221d2af1749c79d4e46385136d9996294499531e60e8fc501f9fd61f8077d
-EBUILD mpage-2.5.6-r1.ebuild 970 BLAKE2B 17de01d5e612540093fc011c37ba8d9944ee321c11cdba31ecadaeecd6ede3ba3ad18bf51e3f0c8b9ddf956c14dda4f276a14b132c823b047c5db480380dd64b SHA512 312066f12c7fbfbcf68ec5c3b595a4ce5fa41cb7328be95291aadfa58a0a13e555cb727bc800192be9457ba46bbb55130533b41dadfa0253856ad604aa22f4da
+EBUILD mpage-2.5.6-r1.ebuild 1003 BLAKE2B 974fa91cf7211af2d930e7e0d6226fa604252c48f4d06a19b5c1c079adffa8aca4f215ac959815f211806c3c2be0534d98c3aa6ec4a23e4497cbbad64d245426 SHA512 6f282bd32d9c45bd087e3e92481a7060401f48cb2f7194c417ec17097eef7e9d2b91a3ffd4ff5f3a8b08a5d58e9fa7b8a255446ee85143df15bd75902d72c4ef
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/mpage/mpage-2.5.6-r1.ebuild b/app-text/mpage/mpage-2.5.6-r1.ebuild
index 0b6a0146109e..6ab60421dd8f 100644
--- a/app-text/mpage/mpage-2.5.6-r1.ebuild
+++ b/app-text/mpage/mpage-2.5.6-r1.ebuild
@@ -1,39 +1,44 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Many to one page printing utility"
 HOMEPAGE="http://www.mesa.nl/"
-SRC_URI="http://www.mesa.nl/pub/${PN}/${P}.tgz
+SRC_URI="
+	http://www.mesa.nl/pub/${PN}/${P}.tgz
 	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
 
-KEYWORDS="amd64 ppc x86"
 LICENSE="freedist"
 SLOT="0"
-IUSE=""
-
-src_prepare() {
-	sed -i Makefile \
-		-e '/^CFLAGS/s|=.*| += $(DEFS)|g' \
-		-e 's|$(CFLAGS) -o|$(LDFLAGS) &|g' \
-		|| die "sed Makefile"
-	EPATCH_SOURCE="${WORKDIR}/${P}-gentoo-patchset" epatch \
-		01_previous_changes.patch 10_bts354935_fix_fontdefs.patch \
-		20_bts416573_manpage_fixes.patch 30_bts443280_libdir_manpage.patch
+KEYWORDS="amd64 ppc x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-buildsystem.patch
+	"${WORKDIR}"/${P}-gentoo-patchset/01_previous_changes.patch
+	"${WORKDIR}"/${P}-gentoo-patchset/10_bts354935_fix_fontdefs.patch
+	"${WORKDIR}"/${P}-gentoo-patchset/20_bts416573_manpage_fixes.patch
+	"${WORKDIR}"/${P}-gentoo-patchset/30_bts443280_libdir_manpage.patch
+)
+
+src_configure() {
+	tc-export CC
 }
 
 src_compile() {
 	emake \
-		CC="$(tc-getCC)" \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man/man1
+		PREFIX="${EPREFIX}"/usr \
+		MANDIR="${EPREFIX}"/usr/share/man/man1
 }
 
 src_install () {
 	emake \
-		PREFIX="${D}/usr" \
-		MANDIR="${D}/usr/share/man/man1" install
-	dodoc CHANGES Encoding.format FAQ NEWS README TODO
+		PREFIX="${ED}"/usr \
+		MANDIR="${ED}"/usr/share/man/man1 install
+
+	rm README.{amiga,OS2} || die
+	einstalldocs
+	dodoc Encoding.format
 }
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index cc4fe4a583f1..a800fe77446c 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -3,6 +3,7 @@ AUX mupdf-1.14-libressl.patch 1362 BLAKE2B b52ccec0a03d97b357d5329317143595e0cf3
 AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed
 AUX mupdf-1.15-Makefile.patch 1189 BLAKE2B 21447e2fd8ca7c396b9b2bd5e1e70ac6ebff5dc8dcbde273e0b23e17281cf2fe16f7a53587f9b0a3b2af1837f3ed5fc4a19666a4cdfa5d491e8b9be71519e1a8 SHA512 6c696b5a522116d075ee1a4759cdf3cae2e8836315f2898a51c15e227d4d57b44095a9927e7d66ab7d522ba6e0c65eed10a379d9e80b791ee8b6022933f615ab
 AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7eed3abfad4d3db15819d5e101ba03e376fc0faea9c4939b7167b276fffe022975bae2e99238d5b4bee92edfb924fd5 SHA512 028930d5e6c86a9052de6e1e0f3e937d89a3f22e10b7fb71f1dba998c480c9914520e4248c21d68291c6fd7684c627b5068c1bb2e027ff6a518d1ca5533eb677
+AUX mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch 3410 BLAKE2B 1181234b618d52766e159366bd4358776ec39fc7091c05025a6a70cf626427fb3a36c0909569d4be22aba8c9695366d0b8a61592f5bbab766efbe8190077d66d SHA512 069c8150402fc463def14ff5690ecfe8a376579ad8319bf79f90823a04799bef1bfa25e79b759a0e027595a114bd3cf48f613541eeb2eec2c85e31d2105062f6
 DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b SHA512 fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50
-EBUILD mupdf-1.16.1.ebuild 3423 BLAKE2B 617b555931b62636135ca23945b18970063b735ad2dc25b79e0b22600bfc21bacac94ad3a729fa41506246a9d8ab5189911664494370d76812b43639ced8df2c SHA512 fe78c972cca044632fed80a591d101e9ab42e3faabc190ce68fb564ec3b725b8a155030670b6c652c954a9d23db232f8a453ee57025d94ff859ac0f7e25167e8
+EBUILD mupdf-1.16.1.ebuild 3480 BLAKE2B 4a2712e52241a5c763e8e06381884c75ebecc25331260be69675bbe34c2ffc153b0354bf8a3e3a73c6ec1532d398a89c84248e4115c034141d51c0dffff7195e SHA512 8341e53be62e5198f5de0a10a25e2d5b0c8643f77f90dc58d317b955666ac90b6ceb4c5bca8652fcfcb8d3541364426ba35f7fdf7db7e20afd1c452d9260fc4b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild b/app-text/mupdf/mupdf-1.16.1.ebuild
index 117de7bc1999..a7b999565155 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,6 +46,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
 	# See bugs #662352
 	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+	"${FILESDIR}"/${PN}-1.16.1-freeglut-fg_gl2-gcc-10.patch
 )
 
 src_prepare() {
diff --git a/app-text/o3read/Manifest b/app-text/o3read/Manifest
index b156d3661c29..accc5319663f 100644
--- a/app-text/o3read/Manifest
+++ b/app-text/o3read/Manifest
@@ -1,3 +1,4 @@
+AUX o3read-0.0.4-fix-buildsystem.patch 703 BLAKE2B 89a61be0303ee3bee3162b9adf0f415795baf9726837ee2e3c805516a5e989a59ecb079f684660ec616fe72a62809b4f845bc1cb6380647c383b8e44dfc8a216 SHA512 0395f4af51deeb330a155e72b55a400f803d451af5e7664f147f7a8b3d1a3d971a209ae454faa9d836a8e28be09d83ca1a6cadb412befd4f16b0f45928e64da9
 DIST o3read-0.0.4.tar.gz 21075 BLAKE2B 35a7cdb3b8242179372c08428691ff0d7ef6df14777b2559847df0a3b15396a8eb28746cdefa99109e6b2544d4ed7997934b50b620d847c3ad150404b8b3252e SHA512 5287a9d58a77cba47397265de9decac1d4327f0a6065cbf7303451d48126a173ad2763157355c9a41237feac6b467ddff5d7e5ad4b4d6c3870f1d09ae0035879
-EBUILD o3read-0.0.4.ebuild 631 BLAKE2B cd93bd95c82f589cb0deb26a0b1a8a6bac7e0a6d55f8617553b21725606d9a0fa2a8f380a5010fe7ff416289c07b38b6c9737b296d0578254c1cf28442046fd2 SHA512 de72f26f1d09390eb361b1f9f9071da5ba204ea2a1ce1a4ed15cd487c06f849cfa4c6363ca6b5b4a50df48a5588e35e2add166d5584a60d50a50f7f84fcc518f
+EBUILD o3read-0.0.4.ebuild 556 BLAKE2B 7ab6882de3d8c4445e1914f72babb382bfa74c9ccd030ee4f298d5d3c85ce4a03f24aa25986ada7aea76686f3ae280a58b4a65591a5ec55b45a2cc5d74841b61 SHA512 35463dfaa39df6c49e998fffc4e0fabeced79e11421c170beccd58eb4c8cef52902514c5ef7eb37947bb6c44c0931fbdb81cd40d272144fb548cb6ddf05f819d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/o3read/o3read-0.0.4.ebuild b/app-text/o3read/o3read-0.0.4.ebuild
index 9b39421c0634..4cf54987a0c9 100644
--- a/app-text/o3read/o3read-0.0.4.ebuild
+++ b/app-text/o3read/o3read-0.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,20 +12,16 @@ SRC_URI="http://siag.nu/pub/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
+RESTRICT="test"
 
-RESTRICT=test
+PATCHES=( "${FILESDIR}"/${P}-fix-buildsystem.patch )
 
-src_prepare() {
-	sed \
-		-e 's:-o:$(LDFLAGS) -o:g' \
-		-e '/^CC/d' \
-		-e '/^CFLAGS/g' \
-		-i Makefile || die
+src_configure() {
 	tc-export CC
 }
 
 src_install() {
 	dobin o3read o3totxt o3tohtml utf8tolatin1
-	doman o3read.1 o3tohtml.1 o3totxt.1 utf8tolatin1.1
+	einstalldocs
+	doman *.1
 }
diff --git a/app-text/pspdftool/Manifest b/app-text/pspdftool/Manifest
index adfb65daad54..674a2f209fcc 100644
--- a/app-text/pspdftool/Manifest
+++ b/app-text/pspdftool/Manifest
@@ -1,4 +1,3 @@
 DIST pspdftool-0.03.tar.bz2 129936 BLAKE2B 100ae29a9d929475d90c0acd6c5e50b61c65d690489ef223238bd19f567757635e0b0e774ff4561aa8e41476dd9a270ef8abafb307ad354e4f919b5ce578cf9c SHA512 8e621719c59f79f7201e8221a851e85d11573fa1895a64ab5e77382fa1103004f70a38f98928a8ce4b5795ce89ac3e4a7a5eade772959e26e49d6db9cc7fe7ea
-EBUILD pspdftool-0.03.ebuild 882 BLAKE2B 0e0793ed9090b7a2218ef8bdd9d1fc50aec0a8b062eb608e2a2742c81f967129d060bbb1eb4972ef64f894c8525c1204480e03a6bd56c3626382ecaadc8a4e92 SHA512 2555568da3e8feb2a0bf29384b67f5204eeb61dcf176d976f2c5f66718a1ab9c0f377d3ad0a89169fe8fb7cfec13864a02fb48a275e9a50299932f87dc52e28c
-EBUILD pspdftool-9999.ebuild 806 BLAKE2B 83accfdbff4beacbbebbf52f22749868028d38b75641dc3171059b025c35ad0ce3bfb613cf90b4dacbe38a5464e1980acfe712cdbb7eb76d2333e27a3892f9b2 SHA512 a0a04775997d3cd9cd460ceb49f96d34cd225590a6d9f39ad65a80d0c04212e31641d621ffffad3742bba70bc1bddabe9e9adbdabaec2ac45ef90718481e227a
+EBUILD pspdftool-0.03.ebuild 615 BLAKE2B c58cc55562c843c6e5561f265db89495e9a39eed7fc346978c7839da98647538fe9e4377e3f2759965884035cf2ae4821f900851da0abc3fc2e5e405519fbb33 SHA512 689365db99cba7ed8771edf48c18cf44c0ed87afabaa0039ef94fe4920ed95bfc5828344f78d208c2e1b19ea73e982a63a6671a11b3131c945c94b1ac35f49da
 MISC metadata.xml 498 BLAKE2B f7458570baa04efbeb3781aefd4187bc5f84b0d7279be2b903c2347cf3c32d7b6ec64c68222ddd665db4698be2b760eb5efeafdc188a49a80b03e0c4d1a95cb1 SHA512 55cb86516399e85deae15087e3625848416af0585a6805ed65245c644b85ed3e0509ed6b9cfd7013664eff00ba0c7c9d09951bac3fce306adb7b96829615452c
diff --git a/app-text/pspdftool/pspdftool-0.03.ebuild b/app-text/pspdftool/pspdftool-0.03.ebuild
index 5b6cbb7e2ecf..5dff5b9d0d33 100644
--- a/app-text/pspdftool/pspdftool-0.03.ebuild
+++ b/app-text/pspdftool/pspdftool-0.03.ebuild
@@ -1,31 +1,25 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-ESVN_REPO_URI="https://svn.code.sf.net/p/pspdftool/code/trunk"
-ESVN_PROJECT="pspdftool"
-
-[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion"
-inherit autotools ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
+inherit autotools
 
 DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents"
 HOMEPAGE="https://sourceforge.net/projects/pspdftool"
-[[ "${PV}" == "9999" ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="zlib"
 
-DEPEND="zlib? ( sys-libs/zlib ) "
-RDEPEND="${DEPEND}"
+RDEPEND="zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -35,5 +29,5 @@ src_configure() {
 
 src_install() {
 	default
-	rm -rf "${ED}"/usr/share/doc/${PN}*
+	rm -rf "${ED}"/usr/share/doc/${PN}* || die
 }
diff --git a/app-text/pspdftool/pspdftool-9999.ebuild b/app-text/pspdftool/pspdftool-9999.ebuild
deleted file mode 100644
index 96932275aac6..000000000000
--- a/app-text/pspdftool/pspdftool-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-ESVN_REPO_URI="https://svn.code.sf.net/p/pspdftool/code/trunk"
-ESVN_PROJECT="pspdftool"
-
-[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion"
-inherit autotools ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents"
-HOMEPAGE="https://sourceforge.net/projects/pspdftool"
-[[ "${PV}" == "9999" ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="zlib"
-
-DEPEND="zlib? ( sys-libs/zlib ) "
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with zlib)
-}
-
-src_install() {
-	default
-	rm -rf "${ED}"/usr/share/doc/${PN}*
-}
diff --git a/app-text/rtf2html/Manifest b/app-text/rtf2html/Manifest
index b3ebb225c4d8..ec51210cfa8d 100644
--- a/app-text/rtf2html/Manifest
+++ b/app-text/rtf2html/Manifest
@@ -1,4 +1,4 @@
 AUX rtf2html-0.2.0-gcc43.patch 693 BLAKE2B fac12178580d8114b7429e3da6552c31bd82f5aac174d08276346cfd1e5ccc1181d31d2db524aa78eee83b1d2aff2a27f74adcc3f52f36b8f8300295c06777fa SHA512 e8f4ad4f30ef8b317786a9c6b864245254c9127d5967ffc61c9934a55f0223c2f15ad388b1047ca3aaef11fcf1bad372f515df24c32a52a3abdbb6aaa5afe2d6
 DIST rtf2html-0.2.0.tar.bz2 75292 BLAKE2B 18cc67ff3642f68ae262aa6e3368be93defe19ceeab07f9e55fcd2390e4c374c7ab315c0c5f8b7644a458e4100a4be3812767b080842d862266083856f5376aa SHA512 7399c98adb4dc0f45e420cd6836c36720d6b19ccbba062d2102b2693a6812642d6193000172ef7eeef5b8a84dcb2d35c1eb99fbf3bffaf8dad43e8ca06c6fe75
-EBUILD rtf2html-0.2.0-r1.ebuild 700 BLAKE2B d9b7e446a395f8c4273c1d968d09d40c07b0d45a0a6ccc335b8429ee02ff0bbdfc3800e133e85199073fb8e26f41ddfb1be8621ca8d1a909ad118a9b4f896a0c SHA512 5b48e0bbd927f43a759cb5d345a728721321734523d41a57415cdfd3ca37b906b5f7c5704547db96b81b5ed573fefbbf3ae5858d504abb16ed33bf34fc1b8081
+EBUILD rtf2html-0.2.0-r1.ebuild 506 BLAKE2B 0ad1a14e906249ce38a68025c708972b9751d7292fe3cf9f9cb8d4c5034f5bfe33f0cb3fd07b73b9dafff83bc761654353252ad3a5f8d03c1be0bf70bf09ebb8 SHA512 3531cf46a2dd394af35e48d29007a5a4498034359c9f1431a8da91f88cb2c924abda5ba645c5aa5a27bea0267770effc873c7d95e3e5bc9eb0d12455370186cd
 MISC metadata.xml 318 BLAKE2B 8456d5d447f556d9e6d5039fce7ea1437214b68c04aafe1a56d7a6dd51286ffb62ccbd6b0c42857dd5dcb0e42c4856b84beef6c4ccd80506153af42cfb0229c0 SHA512 f9fce83b4df04e11ddd34a60cc7bb32e9ab12cc5eed26352de20186660ab8173d910b6cdae63e1562f83bd1ed89f6210aca1cd5401ae93f31296dbac6f3256d4
diff --git a/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild b/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild
index d5f0c353c4c1..f48b71d62643 100644
--- a/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild
+++ b/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-
-inherit base flag-o-matic
+EAPI=7
 
 DESCRIPTION="RTF to HTML converter"
 HOMEPAGE="http://rtf2html.sourceforge.net/"
@@ -12,23 +10,12 @@ SRC_URI="mirror://sourceforge/rtf2html/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
 
-DOCS=( ChangeLog README )
-
-PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
 
 src_prepare() {
+	default
+
 	# CFLAGS are incorrectly parsed, so handle this here
 	sed -i -e '/CFLAGS=$(echo $CFLAGS/d' configure || die 'sed on configure failed'
-	use !debug && filter-flags "-g*"
-
-	base_src_prepare
-}
-
-src_configure() {
-	econf $(use_enable debug)
 }
diff --git a/app-text/sloccount/Manifest b/app-text/sloccount/Manifest
index 343ab7d1103b..1b552b042b0a 100644
--- a/app-text/sloccount/Manifest
+++ b/app-text/sloccount/Manifest
@@ -1,6 +1,6 @@
 AUX sloccount-2.26-coreutils-tail-n-fix.patch 468 BLAKE2B 81f7e84e738ef592c9863590b8648e1bb3446b8556b2562fe20f42af060719bb639fd93c25a1350ee738b095aff6943fb77b7498aaa6d5b2c6d405affacfbfea SHA512 200ccf47b4ca21a17cbe06ccf7b9a8022c794d1b5c0e0f59477b74a37704a6d5a106d4a7791ab84f6387032c938c132ffc1971e4db6532b21d5a0f2fef6df03e
-AUX sloccount-2.26-gentoo.patch 852 BLAKE2B 5e41be564f2aedb7d5094453148e9a9048894473316f77d50570f94dfcf973aa84f362533b4ceaf617fb8f1eb24db03e42a3562c6ba4da2716e652101acb1b86 SHA512 226a28d6ce4bc42f3074dc4390379e0d4539d9e2d9dabe3ec7b60fd41a9b3d9d882d4c4b0dce6803eb137230b67cc622d2b3ab6c4ead0cb90a410efe4b5b18af
+AUX sloccount-2.26-gentoo.patch 2883 BLAKE2B 97234b574060b0c0d7343e2589765c7aea67604bcd56a3671c825d0e798ea122bc68e9f7d6e1fc0b016ae0124e49e19a059b97a59137bc26f242d91c1f6fa4c7 SHA512 6d744053c050525e6d54be467fdf83bdedc80871d3ffb7f65e15ba44224f2c67e8785e2e5621747ee680000aa542ca014ea6afa25bb90aee5469d679b41114f4
 AUX sloccount-2.26-libexec.patch 2293 BLAKE2B 7e2dbbf27535e8a2c6ebba2eca790b67b84cd102a0b000a45bf2b56434138891de72906b42170a488f1a1ef6df4a848f0d72137662b835d5f002350b747f1b33 SHA512 87101dc6c6632d38ff25b842b3342ee7caae0a926ce7c62f07360691a1494f8fefb8a039743d6cc49e3ca53a2eb179a06a97763ff5cf6224056a0916317afa35
 DIST sloccount-2.26.tar.gz 190948 BLAKE2B 060cba3796ba4edc5f64ca3cc16de6f7dd8d1d18e45f9ccc0abe7a27e37daa6c02dd7a3f31b124b5e9ccc81ab59a7c4c6405b86ebb17ca9853c1ac1dafcba095 SHA512 ed6ab315a56dbdc86c654b94e790c9ea9e2dcad0db26b63c0973c33eb7fa634b4ade0a1f3c6ccfd5172ea95f648c1dd3b0ae2575b0aa44b3fec708c24a6aca54
-EBUILD sloccount-2.26-r3.ebuild 1267 BLAKE2B 5f1d76f99046efe81cf597fae62e50078078a68d25eea23e20a5eeba8b605976c8656c722a616772b7feaf919bd751ff44fc6b4f7953a1f3c2a2eb3aecb2645c SHA512 c6bedf3aaaafa0fcd5b3145fbf46034a60081ab9deb8f6168258574581a085afc22cafcb36a70ab24680286cbfc670a08099f0d677a1da0961707b7ff6a11782
+EBUILD sloccount-2.26-r3.ebuild 1135 BLAKE2B ce6a8d294d08b22d71341f98947b4a0b113706e63862e768e98ce37b09d9f707a7f91466887f216394e73526008faca5d58995acc1b9ec7dc439af17f59c825a SHA512 6819e72e932a0c85fd7e7efb55c804fca5dd327b12f2e1c0a51cd3b8e7385c8a6ecd2c24b47dedfe7cce9d3dd32d92fc4b3efda6a70a006b6ef2098a2f798773
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-text/sloccount/files/sloccount-2.26-gentoo.patch b/app-text/sloccount/files/sloccount-2.26-gentoo.patch
index c3a031190a36..5e4010b81f32 100644
--- a/app-text/sloccount/files/sloccount-2.26-gentoo.patch
+++ b/app-text/sloccount/files/sloccount-2.26-gentoo.patch
@@ -1,5 +1,5 @@
---- break_filelist.old	2013-10-14 17:23:01.523330534 +0800
-+++ break_filelist	2004-08-01 12:17:28.000000000 +0800
+--- a/break_filelist
++++ b/break_filelist
 @@ -177,7 +177,7 @@
    "p" => "pascal", "pas" => "pascal", "pp" => "pascal", "dpr" => "pascal",
    "py" => "python",
@@ -18,3 +18,65 @@
       ($firstline =~
            m~^#!\s*\@_?(SCRIPT_)?(PATH_)?(BA|K)?SH(ELL)?(\d+)?\@?(\s|\Z)~)) {
      # Note: wish(1) uses a funny trick; see wish(1) for more info.
+--- a/makefile
++++ b/makefile
+@@ -37,7 +37,7 @@
+ # Set this to your C compiler, if it's not "gcc"; a likely alternative is "cc".
+ # The "-Wall" option turns on warnings in gcc.  gcc users might also want
+ # to consider using "-Werror", which turns warnings into errors.
+-CC=gcc -Wall
++CFLAGS+= -Wall
+ 
+ # Set this to the name of your "install" program.  On some systems,
+ # "install -C" would be useful (so unchanged files won't be modified),
+@@ -124,34 +124,34 @@
+ 
+ MANPAGES=sloccount.1.gz
+ 
+-MYDOCS=sloccount.html README TODO ChangeLog
++MYDOCS=README TODO ChangeLog
+ 
+ 
+ all: $(COMPILED_EXECUTABLES)
+ 
+ lexcount1$(EXE_SUFFIX): lexcount1.c
+-	$(CC) lexcount1.c -o lexcount1$(EXE_SUFFIX)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) lexcount1.c -o lexcount1$(EXE_SUFFIX)
+ 
+ c_count$(EXE_SUFFIX): c_count.c
+-	$(CC) c_count.c -o c_count$(EXE_SUFFIX)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) c_count.c -o c_count$(EXE_SUFFIX)
+ 
+ php_count$(EXE_SUFFIX): php_count.c
+-	$(CC) php_count.c -o php_count$(EXE_SUFFIX)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) php_count.c -o php_count$(EXE_SUFFIX)
+ 
+ pascal_count.c: pascal_count.l driver.c driver.h
+ 	flex -Cfe -t pascal_count.l > pascal_count.c
+ 
+ pascal_count$(EXE_SUFFIX): pascal_count.c
+-	$(CC) pascal_count.c -o pascal_count$(EXE_SUFFIX)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) pascal_count.c -o pascal_count$(EXE_SUFFIX)
+ 
+ jsp_count.c: jsp_count.l driver.c driver.h
+ 	flex -Cfe -t jsp_count.l > jsp_count.c
+ 
+ jsp_count$(EXE_SUFFIX): jsp_count.c
+-	$(CC) jsp_count.c -o jsp_count$(EXE_SUFFIX)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) jsp_count.c -o jsp_count$(EXE_SUFFIX)
+ 
+ ml_count$(EXE_SUFFIX): ml_count.c
+-	$(CC) ml_count.c -o ml_count$(EXE_SUFFIX)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ml_count.c -o ml_count$(EXE_SUFFIX)
+ 
+ sloccount.1.gz: sloccount.1
+ 	gzip -c sloccount.1 > sloccount.1.gz
+@@ -162,7 +162,7 @@
+ 
+ # This is USC's code counter, not built by default:
+ c_lines: C_LINES.C
+-	$(CC) C_LINES.C -o c_lines$(EXE_SUFFIX)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) C_LINES.C -o c_lines$(EXE_SUFFIX)
+ 
+ install_prefix:
+ 	$(INSTALL_A_DIR) $(PREFIX)
diff --git a/app-text/sloccount/sloccount-2.26-r3.ebuild b/app-text/sloccount/sloccount-2.26-r3.ebuild
index 0c1bc3de2f75..6b6eb6730501 100644
--- a/app-text/sloccount/sloccount-2.26-r3.ebuild
+++ b/app-text/sloccount/sloccount-2.26-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Tools for counting Source Lines of Code (SLOC) for a large number of languages"
 HOMEPAGE="http://www.dwheeler.com/sloccount/"
@@ -12,39 +12,41 @@ SRC_URI="http://www.dwheeler.com/sloccount/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-RDEPEND="dev-lang/perl
-		>=sys-apps/sed-4
-		app-shells/bash"
+
+RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libexec.patch
+	"${FILESDIR}"/${P}-coreutils-tail-n-fix.patch
+	# support for
+	# 1) .ebuild
+	# 2) #!/sbin/openrc-run
+	# 3) CFLAGS/CPPFLAGS/LDFLAGS
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libexec.patch
-	epatch "${FILESDIR}"/${P}-coreutils-tail-n-fix.patch
-	# support for .ebuild and #!/sbin/openrc-run:
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	sed -i \
-		-e 's|^CC=gcc|CFLAGS+=|g' \
-		-e 's|$(CC)|& $(CFLAGS) $(LDFLAGS)|g' \
-		-e '/^DOC_DIR/ { s/-$(RPM_VERSION)//g }' \
-		-e '/^MYDOCS/ { s/[^    =]\+\.html//g }' \
-		makefile || die "sed makefile failed"
-
-	#fixed hard-codes libexec_dir in sloccount
+	default
+
+	# fix hard-coded libexec_dir in sloccount
 	sed -i "s|libexec_dir=|&\"${EPREFIX}\"|" sloccount || die
 }
 
-src_compile() {
-	emake CC=$(tc-getCC)
+src_configure() {
+	tc-export CC
 }
 
 src_test() {
-	PATH+=":${S}"
-	emake test
+	PATH="${PATH}:${S}" emake test
 }
 
 src_install() {
-	emake PREFIX="${ED}/usr" DOC_DIR="${ED}/usr/share/doc/${PF}/" install
-	dohtml *html
+	emake PREFIX="${ED}"/usr DOC_DIR="${ED}"/usr/share/doc/${PF}/ install
+
+	HTML_DOCS=( *.html )
+	einstalldocs
+
+	# avoid QA warning
+	gunzip "${ED}"/usr/share/man/man1/sloccount.1.gz || die
 }
diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest
index 7479adfc39d7..deff832f4937 100644
--- a/app-text/texi2html/Manifest
+++ b/app-text/texi2html/Manifest
@@ -1,3 +1,3 @@
 DIST texi2html-5.0.tar.bz2 15397249 BLAKE2B 3e502d9424c2936a922488aab7a66140c0a8369253a5500beeebcea0942ffa7b97fb7021b23212264e110d4bdab4850f263269aacf61de23ac6e052dfcf10d67 SHA512 50afc2f1f8875d3e62a51cc0339bd4c4f058041f42a9fda9cd5b02960f0d5c72838e4f010702ba716dbd256946f64520ce1e5b86539b6f7b8b7ce24a43c98e9d
-EBUILD texi2html-5.0-r1.ebuild 1331 BLAKE2B c8a945376b9170577369ab7a5779df032aa30f5fecd4e9a52937a0b18589309fc6f2a489e2172359fd94da40c0890c2c1553ad9bf491bc644170c7c52b95e4f4 SHA512 3fef0018328252c5156c1126affc72d2a0a3ee3d457b4837353e2c7584131705c27410547a0e7c52770b33b57b9c5557529313f5f22126c21e5ade832959d9e2
+EBUILD texi2html-5.0-r1.ebuild 1350 BLAKE2B e22201f81e83a95bd57ea071847011c9fbade332488b1f46fe77b9acb9de378f90e953f83249e4797745ffa1c371c7e2e7dcdfb026cee4725bfa549088b247c1 SHA512 85c7762bf4cedb41c4da6fe721e467b175ddf8b6b92f017d385adc81af8e8de7fb16fbd58d867abfa4667a1f1e48a657213bd0aecb4861f015dd384f28c5bbf9
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild
index 81ea54fbe106..51e4bdab7d44 100644
--- a/app-text/texi2html/texi2html-5.0-r1.ebuild
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit prefix
 
@@ -13,32 +13,34 @@ LICENSE="GPL-2+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="unicode"
+RESTRICT="test" #411523
 
-RDEPEND=">=dev-lang/perl-5.10.1
-	>=dev-perl/libintl-perl-1.200
+RDEPEND="
+	dev-lang/perl
+	dev-perl/libintl-perl
 	unicode? (
 		dev-perl/Text-Unidecode
 		dev-perl/Unicode-EastAsianWidth
-		)"
+	)"
 DEPEND="${RDEPEND}"
 
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-RESTRICT="test" #411523
-
 src_prepare() {
+	default
+
 	# On FreeBSD this script is used instead of GNU install but it comes without
 	# executable pemissions... Fix it!
 	chmod +x install-sh || die
 
 	if use prefix; then
-		hprefixify $(find . -name '*.pl' | xargs)
+		local f
+		while IFS="" read -d $'\0' -r f ; do
+			hprefixify "${f}"
+		done < <(find . -name '*.pl' -print0)
 	fi
 }
 
 src_configure() {
-	local myconf
-	use unicode && myconf='--with-external-Unicode-EastAsianWidth'
+	use unicode && local myconf='--with-external-Unicode-EastAsianWidth'
 
 	econf \
 		--with-external-libintl-perl \
@@ -48,9 +50,9 @@ src_configure() {
 
 src_install() {
 	default
-	rm -f "${ED}"/usr/share/${PN}/images/{COPYING*,GPL,README}
+	rm "${ED}"/usr/share/${PN}/images/{COPYING*,GPL,README} || die
 }
 
 pkg_preinst() {
-	rm -f "${EROOT}"/usr/bin/${PN}
+	rm -f "${EROOT}"/usr/bin/${PN} || die
 }
diff --git a/app-text/uudeview/Manifest b/app-text/uudeview/Manifest
index 9f296c25f355..6988e2fc3f51 100644
--- a/app-text/uudeview/Manifest
+++ b/app-text/uudeview/Manifest
@@ -1,9 +1,9 @@
 AUX uudeview-0.5.20-CVE-2004-2265.patch 1788 BLAKE2B 6ee4cc768f3bab3cb4116c465d10324668e3d885a73359ff1919263843396475524f146fd747fe5748b1bf5bb52c45993c89ba8c4f8718213eb6f63d0c8efab0 SHA512 63ca3c7d98924df1a2a2c08188291cfc24870c8464bc2bb98d47315f2e28ef876cf732598b6410b2875d9875c2463fda51da959b9e1340c32baa2ec64875f46c
 AUX uudeview-0.5.20-CVE-2008-2266.patch 4595 BLAKE2B dd2ba71e43941812472729575f1481be9d93641f1868952385f7d5f69d6c63991b6856becc967d92c1ced93f0b5a68349af43b011de4ab92adacb93232b226c4 SHA512 fe6ffaf4d55f8a367cf8661ee4599f1224b2bdbf1d3659558c024e7c0d9a6ad043d7eb9631f28e4762b39a5b5e2a417b66be9e98efc7e5caeb9a286e239e486e
 AUX uudeview-0.5.20-bugfixes.patch 3575 BLAKE2B 8778f0f08fa8d8c5faabf2721c195505a53369f30d93c494080025e491121a75135f321fe5c0c117e5bfd538a7cb2d82fc64cb5584822dc9f353cd31b168bdf0 SHA512 c5e4126e9457cb94d6f014ba20e2497969a50b84d917bd31529a2a75ae5b1e9990ec946e8f8de7a83ced71e32aea7d62210416d94b765dc860902825ca6b34a3
-AUX uudeview-0.5.20-makefile.patch 895 BLAKE2B b9f2d027b71667ea78bcc9de05b3f20dfe5d04cb037f06633d7846b2f5ecfb5154736d2ff7faab01104039e9ce4b0e8b5f7c89a42f75db670d7ce2b719ed5336 SHA512 65f223af7f06a854746328354bee5f2703b0603b085a5a52a2a49f09528cffe4a4756a5bd63e86fadf266c2cf1d30691dc75661bca79cc7d122329cdf9bb71f0
+AUX uudeview-0.5.20-makefile.patch 822 BLAKE2B b7729d04f9b881924205efce8dbb398b12e04ed95aa585f2e19fc79340e36772d8c8eb2c9fa23d2d69fedd44c743d85234578edd406b910f6f6ec70457f220a2 SHA512 69efb3af67aa9a47a4d4155b1c346bda5bcfcec26000e82b170d854dbc29e72ce6a8b21f171a72761f8ea2cc2c6fb65e74700a6134c9cbe107b596b45762a34c
 AUX uudeview-0.5.20-man.patch 3246 BLAKE2B 390d89a13080798b1ef0f902d92c82df59c10c6bb5b34eb8655ceadade0e31b0e81c100fc3e8908edf6c482c51c2560b90aaff8156b7ca805908036aa8342b77 SHA512 a940d6663563e7a91b35f5350e05b6cb7939f06d7db8767a8a5483dc82477c796a351cc03be9de49bd55513ca0b2e3203cd82c4b834caa54da9c8aae5750136b
 AUX uudeview-0.5.20-rename.patch 1736 BLAKE2B 820e32f9d2fd248ee2748e3f6173994b02074720814ec8adc6a896b72defc29ce24a356626c7bab414c516555547fe04cbaf304a52c9f141b80a836593c8638f SHA512 afb5b72bca70eb7c156584df1b44fa3cbb6cf07da97a79ff6330acb52ff102584b7a382ce779f2f695c9384d017984cabc670d31b243c0e5d916df19c6846439
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
-EBUILD uudeview-0.5.20-r2.ebuild 865 BLAKE2B b6103031b60e088939a1eb5b88b2af38f92f5e622113f620d559a5064ed9442a63b26704d118728ed9f93d6c04e0915007d8044773a85a91414b98b82626a7b8 SHA512 c97c87e1881cf173b552aa4667b2e438ba7abbd216544b749a68fa4db310c784d3d2756a472c6f8f390ad21553c7ea00069acfbb78e13693200edca9a2802821
+EBUILD uudeview-0.5.20-r2.ebuild 788 BLAKE2B 3b67e40bd88085a6182524f9f89a087c9ac5b3e8d9a8dd9425d994e2b6aaddf92a3ec6ae85f5549b1f2ec7966130a4e747a21d94f1f1df36c285efc58020bc6d SHA512 381dbd18cb9e1f8159f148423fa44d0e22ec4c1494fff3adef85162db362799ca1b9ec0c68d310f2b568aad6cfd536a6f954efccb32414642729e4b8cc7d87c9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/uudeview/files/uudeview-0.5.20-makefile.patch b/app-text/uudeview/files/uudeview-0.5.20-makefile.patch
index ed3cdf66374a..a2366851f467 100644
--- a/app-text/uudeview/files/uudeview-0.5.20-makefile.patch
+++ b/app-text/uudeview/files/uudeview-0.5.20-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2015-11-18 13:52:44.173432349 +0300
-+++ Makefile.in	2015-11-18 13:53:39.244429093 +0300
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -183,22 +183,22 @@
  
  install: 		$(DOINST)
diff --git a/app-text/uudeview/uudeview-0.5.20-r2.ebuild b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
index 6331df769ce0..d8c47f134083 100644
--- a/app-text/uudeview/uudeview-0.5.20-r2.ebuild
+++ b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="uu, xx, base64, binhex decoder"
 HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/"
@@ -12,28 +12,21 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-DOCS=( HISTORY INSTALL README )
 
 PATCHES=(
-	"${FILESDIR}/${P}-bugfixes.patch"
-	"${FILESDIR}/${P}-CVE-2004-2265.patch"
-	"${FILESDIR}/${P}-CVE-2008-2266.patch"
-	"${FILESDIR}/${P}-man.patch"
-	"${FILESDIR}/${P}-rename.patch"
-	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}"/${P}-bugfixes.patch
+	"${FILESDIR}"/${P}-CVE-2004-2265.patch
+	"${FILESDIR}"/${P}-CVE-2008-2266.patch
+	"${FILESDIR}"/${P}-man.patch
+	"${FILESDIR}"/${P}-rename.patch
+	"${FILESDIR}"/${P}-makefile.patch
 )
 
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	mv configure.in configure.ac || die
+DOCS=( HISTORY INSTALL README )
 
-	epatch_user
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
diff --git a/app-text/xml2/Manifest b/app-text/xml2/Manifest
index 97b615070e51..390fa2b31954 100644
--- a/app-text/xml2/Manifest
+++ b/app-text/xml2/Manifest
@@ -1,3 +1,3 @@
 DIST xml2-0.5.tar.gz 86318 BLAKE2B acafc3f28baf21308ecb5ca7bfef3526e0850355d1f4ce29a26ba2a580d5a2a7c6a1bb072f6e4c77df3a4de6fd7fb83bb1d7fd959926b8f34618063eee48c31f SHA512 76b6523e1b64af32529fd8cec52f61f3ca45e452c1398772367f8389368bb7712698e4ba6cb6c8e50e92f68f7f9517f90668c73016e11797931ddb6858782aba
-EBUILD xml2-0.5.ebuild 445 BLAKE2B b76147c754053956e8e772145a71a41b4b1d98a69820876d671c2291ead6fe74c943dee193d1893d4e9ff8c6e11fa7c3ecef6ebed05bb4347a567cf01108959d SHA512 6f994f874089f6190c1f3528d2f64a54022619ee06b80102c6cc17ddd3df383f7f736d6b8879ce53e8a9a6451dd25acf09b7b287dc059e6c11e48ce1eca98a3b
+EBUILD xml2-0.5.ebuild 443 BLAKE2B 8adc7a25b0ed8efb74da357f4dd325e2614eaaa097434c717059b7a6aa0156c79a686c46970f1f0cfb7f4373c536bb999b831a7cc05f8df78fedd3c7df7af3c3 SHA512 7b39bba0c4d911e33139f8bd84081bbde7ef50a1bae34c25a44303bb01b51c06352044f3134a97e2519d79a04500dea5711874d69d69039abeb976cb6a6d08a8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/xml2/xml2-0.5.ebuild b/app-text/xml2/xml2-0.5.ebuild
index 45dbd05bc02b..7afcc12352ec 100644
--- a/app-text/xml2/xml2-0.5.ebuild
+++ b/app-text/xml2/xml2-0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="These tools are used to convert XML and HTML to and from a line-oriented format"
 HOMEPAGE="http://dan.egnor.name/xml2"
@@ -10,8 +10,7 @@ SRC_URI="http://download.ofb.net/gale/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
 
 RDEPEND="dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/app-text/xml2doc/Manifest b/app-text/xml2doc/Manifest
index 21b91ae07d53..dad5e21718dc 100644
--- a/app-text/xml2doc/Manifest
+++ b/app-text/xml2doc/Manifest
@@ -1,4 +1,6 @@
+AUX xml2doc-20030510-gcc10-no-common.patch 195 BLAKE2B 3c90b98f57ae23f78b586dadf8a53b1a092597bef4e1bfee41fef5ce47cf6c639e03a59a8985434c931b0e7a803262d8f03874b2b4c676980efe62b913f214d6 SHA512 4fc3640be15c6c5192bb2a2a74ced1ebc22fd33bd2c49a39df295239e8b4b4047d6c840e23df091c060dcb6895a0dc1552127de0029d2d403214352e8f7f218f
+AUX xml2doc-20030510-makefile.patch 2661 BLAKE2B d9822ba57187553ae6da3f2b3f146bd3ae4316a99cb9608d88112a18462345c4614e167bb3757a723b6a12e2b521f1a2fb575ef19db480ed45fa60e133297c38 SHA512 c5aee7f9b98f1c64345459cb3ad6132082c04020a56f39fa950584689953c1058564332351a5b51e130e077fbe15c08ea88f35504888a153bfc878d8210b8b00
 AUX xml2doc-pointer_fix.patch 627 BLAKE2B 3ca9313b44d88fce3f548874d40ed57b42b9faa66e30574677c911f7d5c9d0a8d5eea8c35781162302543df82c5b38b1327fcaabee0a50c396c95937c3a86e44 SHA512 ebdf69986821fdb1a22e3da4447729433d7f30d08e516b5b28c1f9e4fe6ec98d7a31e925028f940e8a0aaab5c05bd52a1a4d12564fd47a79953b1de606fd2430
 DIST xml2doc-20030510.tgz 53307 BLAKE2B 3f7e44ede6ac0a2ec4762e66181de34ffe553035b54ee302345d1b38a5063106fc4ba65abec042b4ec693b173d70fc4b548ebc942b2a8f6636f84e7beeed2bd6 SHA512 9eb2970b7adef1669b9b0aede2b3d2b42ba234c8294f0f8e6e230d8fcc6cf878675b2f0bff87ee36a255ab29376be844d92d382be7aad0ab11972847cfe49dbd
-EBUILD xml2doc-20030510-r1.ebuild 1189 BLAKE2B 85aad44ccaee3ae47e8e7e6ffc2e0e352a8b6fe5e3d141bd01bd2be35e55ea84664e4fe86e451218658ad5323f42d41ecae02883292456b947a569ab6c6f2cf6 SHA512 b5faa7a55c0884b083bdfc47ce539a81d4df515b232bc4563ff8a4dd809c886dc9b18c472cca3ae406f872467d59606094df2c59aed5b28d2e3b454fd38b7cc3
+EBUILD xml2doc-20030510-r1.ebuild 1010 BLAKE2B c66afdbad87d601f358b7fe438c4f483833c4b84f38dfb12ffd904ca9d3594c3eaa9228b19af46432b0583c879cc8248f83ed74d6a9c161c6f0a0e0ebd7e2c18 SHA512 1b15699e2cdf8ed954631369a4f83683ff0d0c86a23a539494877704867c90708bfaebed4b0a0966c8c61a2aa92e4078727e9df3ffff28d990264f193050b649
 MISC metadata.xml 244 BLAKE2B 6c0f152456a096c4bfbf861d8d7db04d0b8c605deb5f9a3277cd6b60df4a714c77bb12d5e4a491a193da11883447855986468ecf5c707600febbed973253181d SHA512 b4abe1dd13476a480e518e284cb832c2b41893049169975ee44edba8661af79b7cd8f8110e03b920fe90cd8e0e1d926bd5a692a24ecb841bd454659de3422ee9
diff --git a/app-text/xml2doc/xml2doc-20030510-r1.ebuild b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
index 481bd3d247ee..e4a387e503a4 100644
--- a/app-text/xml2doc/xml2doc-20030510-r1.ebuild
+++ b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
@@ -1,59 +1,50 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Tool to convert simple XML to a variety of formats (pdf, html, txt, manpage)"
-
 HOMEPAGE="http://xml2doc.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
-IUSE=""
 SLOT="0"
-
 KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 
-DEPEND=">=dev-libs/libxml2-2.5"
+DEPEND="dev-libs/libxml2:2"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	# Fix pointer-related bug detected by a QA notice.
-	epatch "${FILESDIR}/${PN}-pointer_fix.patch"
+S="${WORKDIR}/${PN}"
 
+PATCHES=(
+	# Fix pointer-related bug detected by a QA notice
+	"${FILESDIR}"/${PN}-pointer_fix.patch
 	# Don't strip symbols from binary (bug #152266)
-	sed -i -e '/^\s*strip/d' \
-		-e 's/^\t$(CC) $(LFLAGS).*/\t$(LINK.o) $(L_PDF) $^ -lxml2 -o $(BIN)/' \
-		-e '/^\t$(CC) $(CFLAGS) /d' \
-		src/Makefile.in
-}
+	"${FILESDIR}"/${P}-makefile.patch
+	# fix GCC 10 -fno-common change
+	"${FILESDIR}"/${P}-gcc10-no-common.patch
+)
 
 src_configure() {
+	tc-export CC
 	econf --disable-pdf
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)"
+	default
 
-	cd "${S}/doc"
+	cd doc || die
 	"${S}"/src/xml2doc -oM manpage.xml xml2doc.1 || die
 }
 
 src_install() {
-	# xml2doc's make install is unfortunately broken
-
-	# binary
 	dobin src/xml2doc
 
-	# documentation
-	dodoc BUGS README TODO
+	einstalldocs
 	docinto examples
 	dodoc examples/*.{xml,png}
 
-	# manpage
 	doman doc/xml2doc.1
 }
diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index bd403653d478..1de420434259 100644
--- a/app-text/xmlstarlet/Manifest
+++ b/app-text/xmlstarlet/Manifest
@@ -1,3 +1,3 @@
 DIST xmlstarlet-1.6.1.tar.gz 420923 BLAKE2B 56bf29f62549a7445e3cf15b6a3f60558dbcacf96645c3acc5a45b432d61f47614274a5d3e7234399f7dbdb854b503d73a6cfb8989710b7363d743dce4dff8f0 SHA512 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b
-EBUILD xmlstarlet-1.6.1.ebuild 933 BLAKE2B bd579b52641fb927084d915a1272b1f57f198a16f5f810f780c6e36e3667e1a62f2c1ba2fe7cd62740425457b22382b3a05edd4997616489e6dcea2f7f813c17 SHA512 9907ecd56ddc3e689799ffd69078957c240bb39ad502317733d9d021605d0b26e22f67ae511b1a3ce194d58fa5ef6aa95df7536046168c18eb73d976aaeb3bf9
+EBUILD xmlstarlet-1.6.1.ebuild 944 BLAKE2B 43de29f725e2cff8b62be3b68aaa43e8473bf5e3f50e2017c823b5fea45e44b41ef8a1fbce8e8bb5c48cf0927bb24d6903f2d4ac566f71c1349fbed3603abcbd SHA512 68e906d0da8fbd93ce2423e5794545ba2a18929ab991e90588384d465719ba2ff29605c271e55d93b47a31834741d4d1a5c501bd62df9f037e42bb4a77de3a49
 MISC metadata.xml 293 BLAKE2B 1e39cff7005653b64f2f27c49262c0ae492da15d33d361e5e9b4148a3e975db2b30e26468fe5cf7f61155f53a3f76a16121b8a4c85ae5420d0ec74885d33bba9 SHA512 9fd9f809f74a272cc9abb789f3e08ab9b2ecdd1f6ca3931f43567b3b2e3423c0622bd3cc52f5dceac6989282351400fe9c1554ec2b69439986902b11f589796d
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index 96f6d174f1ce..48e432677af1 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
 HOMEPAGE="http://xmlstar.sourceforge.net/"
@@ -10,30 +12,28 @@ SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-RDEPEND=">=dev-libs/libxml2-2.6.27
-	>=dev-libs/libxslt-1.1.9
-	dev-libs/libgcrypt:0
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/libgcrypt:0=
 	virtual/libiconv"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0)
+
 	# NOTE: Fully built documentation is already shipped with the tarball:
 	# - doc/xmlstarlet-ug.{pdf,ps,html}
 	# - doc/xmlstarlet.txt
 	# - doc/xmlstarlet.1
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-build-docs \
-		--disable-static-libs \
-		--disable-silent-rules
+		--disable-static-libs
 }
 
 src_install() {
 	default
-
 	dosym xml /usr/bin/xmlstarlet
 }
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 830cdb6d83b0..aec8ba2dcaee 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 4e3515841e3a..62038705bf74 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,4 +1,6 @@
+AUX 1.10.7-cmdline-args.patch 6257 BLAKE2B 4c517dc5ce15177ac66a343265fdb8753fbdd17e43e1ccb8ad802fcff04a507af6cb9ebbeb8097d0f1bce5e34a3d07689cc19d07fb252891da2b38a92f716704 SHA512 5ceedd8ef20f094f68d75764b4e6ab1295f535c521019df094a02bbe64a4a0ca0492b70ca1b884fd579e30aa2ae5317c1e183cf5e0947d709a080a84217b4344
 DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
 DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+EBUILD ant-core-1.10.7-r1.ebuild 2816 BLAKE2B 8c3ed79f26ddd6d2185da1909b283a2cc1c0e4b6cdbe247007797d641d2451882e10f16eda558a4c49d6f7a9533552ce972a85258cd97a1955979330495f2797 SHA512 a568d364fc5f44dc726d8cb032e1ccac07e2bc6bce637544f1cf5342321056650eb6fdf3832a69b4f89eb19020a61bb48486e74d25135322681e23584026df0d
 EBUILD ant-core-1.10.7.ebuild 2768 BLAKE2B 188fdb5427548cdf155bcbe6c16627aad533189eb2ac1f85fc8e8112de1571dacf83ca4388a1c9f367ee28f71e8c2a29f84d7cc481b3daa928f15759b22cd642 SHA512 50eba5fe3077ae9ada0f71d2739ba0179df19e4ebf70f3b8b2cc79da91353f22a76d7e9891104856e1b34c2046ff325b08fc2c41a08f1c5559417780345a1307
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 662dc8150ea8..b960e4b00257 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -34,7 +34,7 @@ DIST icedtea-3.15-shenandoah-9fcff2250bb4.tar.xz 7077244 BLAKE2B 1122b74e1268357
 DIST icedtea-3.15.0.tar.xz 1532664 BLAKE2B cdaa6fedc3ca804d63c9025c7798287948ddf917a4e04e15019c5b9b96db661ea339e51dc94b68647e4c19a01498c21a1a61da5496bc6cd873f144fd0c76d1db SHA512 7c5917acc03b19a41b5001beb71a72b3f63e65b3c97c5f9173067fbd795088f9578f628b386bfa0e934caa8f4faab4cfcae80329ee7180c0cbe49563309c84ca
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.13.0.ebuild 12224 BLAKE2B 65787bbdc6d6acf0a13795840e92e61d20b468c9e1c6b41acaa422e79f74bd6b88d2e77ca66a90295251fd1da502dcb5879703b26f17219032b354b1c9cec824 SHA512 761c9abfaedd00909a89493787bf93b265e8748442eea61b1a3e2c101c477629140f3db071d1dca46c31835d938cacef800cc53d7703fc25a00779ad73086a28
-EBUILD icedtea-3.14.0.ebuild 12224 BLAKE2B 830e90984429b75291054a7cb9e21ad1d07cd16e73f3f7fa87760fda42ec4924ad351d45a6dd8d8ff0706a32288e4029c814d765e5c8740d5668f1c6a6642319 SHA512 fb9661b0375321ffb47c9e938c6d4ccac9d35e2347105e1e306944aab0bcd173d343e671e839dbfe954d85c434cc5c9dfc3f95d0a1fa9975247e18d0d8d3a639
+EBUILD icedtea-3.13.0.ebuild 12239 BLAKE2B cbbe5862a854f65e5bbe0a72e42382a0444138f6fba50543dfb7cd32a541e125823a98f01eb76c2be7c2767ec2b40d1da143dbae753f43c26c6857dd7715597b SHA512 b3ce903a047de517999eb85758f8e3007d0ae1cdaca19ac9fcfe62fccdac0400326276fb408debc498d3904eaa33f5a815b624ba1a38780331a1074c50f30c50
+EBUILD icedtea-3.14.0.ebuild 12239 BLAKE2B 37ed8dc7a4811208bc774e7584e0f449756d5b5f0c3910c27ff3c91b32a740b1cb43a6b006d416fa06179b43b8192ebb4187c777bc1966c318f8ae1d92aa3a58 SHA512 b9122e42ba979008a6aef712e28563990213c3ef4b2402c63e893c89f099f3e1637f2ae2d3b98e73482847d538ee304871a7c9731ed4a205094e7ed049eaf672
 EBUILD icedtea-3.15.0.ebuild 12239 BLAKE2B 2b18aa0d07350bd725f0f19a3d9d679afef0d712b5a0bc1045ac4351b360beb7bffd9f7f7d3ed65534a1ff6c190548d9296a515b374b55ef695616e8d15eca53 SHA512 bfd9ea872caabed82d3f4eacab9532c374618f86a931c388dafd00ced6ee47ae3589af22fa4dc6017ab5e6b6cd846b9dfb0eb6ce6d56e985fd656431109cf1ab
 MISC metadata.xml 2258 BLAKE2B 589f588b726745c7c488da1a900a97586cd7283534e675fe478149c3ea178e7c4fe6149b0430ca6db3546f74a632ec6da7ddb12f6efecc0e0aebbe8fd63790ae SHA512 22d6948a51e8b56d98aa60158903eda355fca255f5ea1d8b0cfb7767c346d91ed38d51fe0a06938e95efee3d544708d880f8a41fec9cb789a6af9eb1126a95d7
diff --git a/dev-java/icedtea/icedtea-3.13.0.ebuild b/dev-java/icedtea/icedtea-3.13.0.ebuild
index ce1979057abe..680a2787526e 100644
--- a/dev-java/icedtea/icedtea-3.13.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.13.0.ebuild
@@ -353,7 +353,7 @@ src_install() {
 		rm -v "${ddest}"/src.zip || die
 	fi
 
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+	dosym "${EPREFIX}"/usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
 
 	# Fix the permissions.
 	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
diff --git a/dev-java/icedtea/icedtea-3.14.0.ebuild b/dev-java/icedtea/icedtea-3.14.0.ebuild
index 03d9440ef6c5..7a74a94a834f 100644
--- a/dev-java/icedtea/icedtea-3.14.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.14.0.ebuild
@@ -353,7 +353,7 @@ src_install() {
 		rm -v "${ddest}"/src.zip || die
 	fi
 
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+	dosym "${EPREFIX}"/usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
 
 	# Fix the permissions.
 	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index acb00e461032..caeebe74909f 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,22 +1,25 @@
 AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
 AUX openjdk-bin-8.env.sh 705 BLAKE2B 0e155706fa9633a9a2e54ae2c9ecb95516c0b46ead84e24dc4c4d79a1b67644eedc6b97e6d4e17da4f6162e2ce7bfafe60dddc950e7f76a666af46920a8a5025 SHA512 ca6fc7b0889ae3d2be386696eadaf9f25fdedaf94cb24696a2de56214695cb0211226bc87671449bf366763f568229b22409201e532d14394c641164c48ffe2d
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.4_11.tar.gz 194920675 BLAKE2B ad509e368aba7b5fce9e6212b296442bcd970f4dfe59e53dd13977da0137674fd85164657fa1abebfdcf58640ba511f1fcd30c46ec02a08edba5b498050bc60b SHA512 7fcd7c4eddcd9e2b6aa5cba69f2926a1131cd8246348f1a0c6575dca9c73b677d245fd8e12b1b41415aaf3dd0660581398f30c29503787e17428839e3fadf5b5
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.4_11.tar.gz 183239547 BLAKE2B 781647daac4ff5ac2e93a01aed93a6729c12611e1de75dafcc018c5222a442a846b9ccf8ec1e5381eb191ae2b8252a9878562843eb675299e96563c65e91f4bc SHA512 b2e2bb63706bfa197bb7ea5560dedb521666c52900c9ffe91ffcff5ddbf4e0cacdb4efddcc03081f06c9686e9451f27a905d731a3bccd8925c952ddde331eee4
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.6_10.tar.gz 195417692 BLAKE2B 7834b8d29535eebbd62b6e7d1de71a8d49ab323d64d60c7e7a2d54247236e4ff1628907f1cae0807d19292a888894e060175673499cf802ec1af1881eaeda4a5 SHA512 ba26ccd26990888c6905a52c706ddd06584d61cffd2cd0c2d8fd030c9cf23d0ac5518e50aba3c1949fd9fcc73ca3736659cdb5315c13279950504ba25a77aa70
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.5_10.tar.gz 183456230 BLAKE2B 0ec2ac6e59012e047f5191baf1b289215bcf898238efbb0c2aacc6f0147aa2013ee70fdd31f10a89533de74940c9de3133d0a1f9b7c9f583ed9422923aee6884 SHA512 fa0c2014fcf0e6d221e1c06fcdcc0020cc8547fded6f74a9d7f0b64ea3b277c123530390b01291a4d3e36169bc1af40b797d75f60fca7af58d1d6e658c762f81
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.4_11.tar.gz 181290255 BLAKE2B d8d25d71e790527c572c74f7a53317933b8a0801a8b3779daa9fe92bbe8b11fad74cf7e2e2a2194dc514930fba2c86fcdd630b06cdcd0dafa8fcecd5bac6be42 SHA512 5b50f0585ae09e1d446170b40728ad915b7da2c22341385a8b014ac09ca805acc413c840c6ea8bac4b579d418200208a53f98759b446a28ad3e28b0078190b50
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz 183667331 BLAKE2B 534ac147022ab93e862d062559999c008a0b8365418dc8e56b531dffa57f5b9a6675053fd09bae612fa350929035be961764017c12a1dbb04f3da0b0c3378595 SHA512 9f066212ab05db8d830d9fa01e754b925d0a56f14ce318184b40dfc4e1c52e2a757af2493ecc75235eba30f2059079985c0b737127c00a3c645f5b79558d08d1
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.5_10.tar.gz 181474028 BLAKE2B cc80042702d6c77e35da5df0c1788709ddeaabb76fa940f4c705cf1801b27931bdd01558b4b4743b8e8acbebf62e1ebdcc7c81bbb286a288a816553ba2890531 SHA512 0392a68c90bd6cf7ed68a73d5420da0de207621f4203e38e24ebef8c52c8731d35b1ee2600636504ce12e553d059a590d40ad20184cfdd4dfe73fd2e2af3804e
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz 196818652 BLAKE2B f67327882afb3fdf0636d5e5262236376ed8f98eef2c8153457be0ab068a5abeb523a3873f43ced650ac623b90079d80f2a744beb8f410d8763ff7798d5980dc SHA512 8b42abedf935b8fb186a2efa11203231021417a745f03d557782aea6c5ce84f7b9fb126d3a00ac5159c349347a5d1cc9aa52b2378b2aec58d82f55a5fbcf471f
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.6_10.tar.gz 181717626 BLAKE2B e918d7be5bf119472772d6bbe90dc27d4ae8c18e7f80c508e94388a6c7642d50b9b6a1b8055d56f6f2d9d01e4d9df84a8589959b9c1334720f05e7c9374e42b3 SHA512 bd42374b96b26afea0fae9922d2c98da8511cc182b063a8f0da30272e0c6e1ce85faeb1ae3f58eb33f3fbeb2eb4e313c0a4c74a96e00b1bc87f18eabcefe83f0
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.5_10.tar.gz 196955466 BLAKE2B 22f97b4d8a122f4727b0000dfd37304e781a88704622a1e07301b4370139497c96bd1c5d7c22f378e335682d380a0f2aa91dcf323dd3c8479521f123b07103d2 SHA512 893fcb0eb6bc5e330c5e7d3ea5a2b16d1d0301206bb1319730d084356310c7b26ecef2b699cf6f375bebf769e0eb4c96b2456488b43d4d52c51f0e2316a42618
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz 197198464 BLAKE2B 8b629b5257823517499f362183ab6a76b023374898a85269efcff824059f1d93a2a79c4c6907a13971b833aecb30f7d07697c1fafe10e26fa12f44e9a5d023ff SHA512 e8fd5b64049c4d9a50e1b3a9391e19d07d40f7ebc68464a0952396dabf0c9270f934e695b4ad33c0e2c2fa64585a81f4fdce488d5ade95d9a74fd352f2dbae43
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz 104510642 BLAKE2B c67f640ededdc0d91fc02144c9e1d58a4c94984d6679e22172ae536a7c1397296bd52d5037eabcf255a2655e0d2f2cb3fdfe2e10a6f5739cc351e1d982acdbce SHA512 229ab2fef5339d396ebf5923454f45a9989341e8e9c9d57ee8779c6d5c8bd78d9d62d7a24d236b7f66baf79db641b04b9f9809d0734c1028ade7039bb2a94926
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz 104544830 BLAKE2B 9ccf24a2409da8989e2bf9c9dbca9176036b179a25b0e21df3d4532b7144edbf57dc45b739c6d0891251d2e6caa00f8eab664670602b004549a5c13a1d7dd133 SHA512 3bf3272b19c73652b485df1293f27ce1daa32be690bef053ff7df164f9ac73aa197f4d4ee782aafe410e5e81b1d0db005c4f16d601668b777f49a7d524ab5ef2
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz 99367073 BLAKE2B af507e3c1877a4e895f65fb4f47f8559ac626c78477919f281ff9ce34dcc0c6394f4ca4336d406efed541c3190147188e772922c09d91ba0efaac37ed7214a90 SHA512 1b166e21de8889a1aa7e90591e635c22bf18ccfa1b9d774dd01cbc97f4c0a732ebdebac8f18aed649869e52512fce35ee9a8398e1526c2e06d6109994e3772f9
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz 99245777 BLAKE2B c8f2066cfa3f3fc9add7846ccf6c5d05031ff7adcfc41c9c6220615f80a1fb0168dd9b2faefeb58c9ee3fe2b31223d59c694b2b50635b13161c7f3c56bba7f78 SHA512 86490b52d27c6fb3031243e9f72284e5f77ce2362dce967cc7659263137818bedcaec147492e84bf9a88f066974fb257aecf36c59d91cd5789c57ab5e410ce57
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u222b10.tar.gz 101730569 BLAKE2B 3391a783edcd00820e7db92c11d2707331e9aecd352802b8cd0fe565eb42620d179e2decc32452a94bff4951b9f1fe9e276b773135d316847c215f7f42e24a7c SHA512 691ff8e2f2b8d7d3004fd11470cc881a8a7d3b60eed6007986db7ee8561bc41c3508b3c9b8f4da4a298a84e3023fd9b874f9d8f20664d89ce63cdb760f554465
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u232b09.tar.gz 101775907 BLAKE2B e051da5a0bfddd1310ab74d728936755504f99a055b8e3af9d91affd1e781fd76eaa1a5bea297565d81e946e2f19e9bbbfe146b634bd9fc30fef4d936c97261f SHA512 bab1105cbce30d8fcf5f4c48d28a155ac4d8fa635d8d4f9d2d5ccd337fbc78db398e991b6c81b75e3dd76c695a63686c22193ccaeab97f0439f67ada56acb61c
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u242b08.tar.gz 101817012 BLAKE2B e86abc1708f23fd9e3809824fbe3084dddbf115a5b5d5fac7a4936e16f78033dafea0ee6e6113dc463e33f55907caefed4ae2cb85864ef1d59e7b45e2708a564 SHA512 c304aab812559a5da9b346759533ddb3e1bb6320e959e8dd01a0ae5cb3b85a6282492e7bdfafef40573c3970b79b8bac8e2abff021a43966a4b7e7edf80ae70a
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz 104480114 BLAKE2B 83f85b07cb1613976560d2e4df9473cd483888aa61aad17ab310683689079dc4bdde68d134123d1f3431f38be362a281cdba16b0c71e50d3fbf6a5e9b9ec2956 SHA512 8c090817bdbe2c7e1caa61b568c43e1a98e9ab5623743f4c74f6fd05254b3148e9a092cd475f7d141b1ec8ceeb4207a0f74ec1bc408f9b024806cbb740f9a2da
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz 104521598 BLAKE2B 10ec4e5312fdcf1bfbcc85e899795fe0d962b816ba3cd8d229f97f7a273fe2e09666c69c55dda391ec6d44b1ba88810c204a357aefe91328af761f9cc019cd02 SHA512 989e69c8de49048fabc1ba3c91ad7e95329149293f58af545c23a444da974bc6d4157b21facb1298d9a5cac9b552250812c6c71b6652bee93cae7edc1e72ce5a
-EBUILD openjdk-bin-11.0.4_p11.ebuild 3136 BLAKE2B d6c8f6dd282760fc630db5da4a01122b3b1cab099f5baf679e841f3b585fa486952c0660f39b576b4b0dba1ddb3bb3075642238e0ea45ddf12d9d774f46d65eb SHA512 f0a481a729b3111f3ddadb55e3dde2769475844ae7e983fa2e87cc5822710f4e39a2903add53e1814ef00e13b9659e6d349979bc1e6419eb3114813f057ce616
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz 104566766 BLAKE2B a928ce93989d87382a654beacfc7600090816005f1ef21fe4fabbeaed8c5e446292a8f3c651e93bba28b2b95169a99a4edd849db8ff7c9eac5cc5507d710bc65 SHA512 f72f91fcbecb1fe48dd56bab86c6ae53b3bd2a622a1228b5feace8f9cd84f60d6073f9d1d3e6215c894b6d14f213bf052e955c2935fe57d4757ac09bbca12cce
 EBUILD openjdk-bin-11.0.5_p10.ebuild 3103 BLAKE2B 1d1ea355127fb32ace6af9780c5fcf2d5f59515bdfae4d4fe5f2ba467b1e45f0315d0251ea6c743a52b7f790e9d998e53e2a97d14fb087a8bc322e69f3918066 SHA512 389fed7ce0aad66f9fd3b706c44f7d8ce5b7f6f5534a0a14b7427eda3c01f511cc76a3289a343a4d9c657579fe0f7039bf4f5c6836e4fd5874d5e8b4b752d6c4
+EBUILD openjdk-bin-11.0.6_p10.ebuild 3136 BLAKE2B d6c8f6dd282760fc630db5da4a01122b3b1cab099f5baf679e841f3b585fa486952c0660f39b576b4b0dba1ddb3bb3075642238e0ea45ddf12d9d774f46d65eb SHA512 f0a481a729b3111f3ddadb55e3dde2769475844ae7e983fa2e87cc5822710f4e39a2903add53e1814ef00e13b9659e6d349979bc1e6419eb3114813f057ce616
 EBUILD openjdk-bin-8.222_p10-r1.ebuild 2178 BLAKE2B 2b7e6e97ad3c57af952937f7dd6987b23c0a0e185cd46e026079edd57f718d7e78edb5d83616a77f5a4b8de1b0c4e1ece1feeb45059ae622cc4d044d8bbcc998 SHA512 59688aea079896962cfbac663e15d08302bb926682fa49d2a23d0c7f8eb127fdc9a4181114a027f5865a0ebd5c357d8283349fd6c32c468de1a16c0c41445e71
 EBUILD openjdk-bin-8.232_p09.ebuild 2181 BLAKE2B c514fcc5805bcaf1a112a74ed8b34f7949cd0a24f810a0da94a10e7671215a918bd1d43ee3398c6a670cee7ca54717504a53859c0f7f7ad10adabb8f1936dd1d SHA512 8650738fdd5f274e62cb5a25fe6214d8fafe8b32b22ead6e1b36584e8b709b1f0d2002a0c0e8db8ee171f93a1b011e48199bd3fffd55fd66d0009c3981177c4a
+EBUILD openjdk-bin-8.242_p08.ebuild 2099 BLAKE2B 7f83e901c701701b9e88384e24a8607a01f7cf94d4062d646146f305fb3095e0335766cb78bda873c1f59d2c3023c22b5bad56bbea65500228814b6c1117eacc SHA512 aaaa0c93c0d356d12d306640ce8b3699647e8e560bd293c7695258e3de77044b187cb20e9f8296cf1170dec2f87670092f6b7c442390f96620f541e7f910aff2
 MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.4_p11.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.4_p11.ebuild
deleted file mode 100644
index c629d40f4861..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.4_p11.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri arm)
-	$(abi_uri aarch64 arm64)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source webstart"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-11"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index ffabbc6a1f57..a2ed6a094b39 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -4,8 +4,10 @@ DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.4_11.tar.gz 42055392 BLAKE2B d9634ee9
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.5_10.tar.gz 42132415 BLAKE2B f857b9618f653ce3df1a1f6b3a3f3fd0ceaaa2d66b9d58872817fdbb7846195459b0fd1d79cddb444e0cd17faafc46bcea85fa22b810d2e93b95a9829da6dad5 SHA512 b13ee8af718c701195765eb6c36c8a6dfc32a5a39f8da4118db4e5ef8ab2012f8952cea73a964fcac079487b6372c0be727f0f2df43b948ccdd4663e6b327d1d
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u222b10.tar.gz 40934975 BLAKE2B e03bfb1896e140b79474a4c9004a97aa07bc9fb29c608b2320c05625a56936555ff8ffda7c9656a2d3ff7628bac769e4d14694b2be6d08e4c90b0e6802a05afb SHA512 e1810c4115206cf78c69b971354474098e853c786b472c2140b9e16187efcd3e15bfff26e743e7a532a6f0619f4728482348583662c1eeccd1ebbb82b980f8af
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u232b09.tar.gz 40963409 BLAKE2B 16f0cce76aad30ed27c84f5bf5e5469c947023d8ab07886013e50ce9af31c90df11dfdce6fa220ff5d59b511dcb7ef4df7dc73fa7a7648d2e92899a81eec6109 SHA512 5ce98215c36d2870ebf0112205dfae39c3d43528ebe175dd16ff54b16267b44ada5d5d26e7d7744db95c3c8faee2858fad59c92b065993397defa64cb58c294e
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u242b08.tar.gz 40987250 BLAKE2B ba3f15b938b4462a186c13ca8ea12c5e5e5bbfe5e716af1911e9525875e6956caf3155423f32433be05ebd1a3c873d94b33a797298d6d09577a775c7dfe2a658 SHA512 11dddf75813aa3b88b2bfb2ca89e186cc15601f75ec4f9cbe92c8b60f61438f75a76e45c26bc614eb54de16a584e906f8935cb2146937b96f2970eb89dddea09
 EBUILD openjdk-jre-bin-11.0.4_p11.ebuild 2729 BLAKE2B 6178dc7f7e31d3aed99ecc29a0eccc5d5b553c6a9080ce8a58beb662ea2720c1011a80ad6eb1e90f263233b99001676548fc501733e9f76dad2a4192f432b01b SHA512 4bb7c3c342b0771267ca8265fb688e92c8e376f611ec6ad32d0f5953ad900a519fbf688c4f2657b8d2d6fc486c6536d61fc0f2b44a806b41312c47cb6a4469f6
 EBUILD openjdk-jre-bin-11.0.5_p10.ebuild 2729 BLAKE2B 6178dc7f7e31d3aed99ecc29a0eccc5d5b553c6a9080ce8a58beb662ea2720c1011a80ad6eb1e90f263233b99001676548fc501733e9f76dad2a4192f432b01b SHA512 4bb7c3c342b0771267ca8265fb688e92c8e376f611ec6ad32d0f5953ad900a519fbf688c4f2657b8d2d6fc486c6536d61fc0f2b44a806b41312c47cb6a4469f6
 EBUILD openjdk-jre-bin-8.222_p10.ebuild 1957 BLAKE2B 0984ad6b29666dc0d15d473048f68ba3fd457b49f0ed8751f11290d510c921424d4a30729bb412e9cd4f6b7bd5b6791e712311694a0ca8619f88f91c1b82fa92 SHA512 f6edd2291f38cade03bdb04c43d96533531206977a765b0d262f89261cf4fab0bd2128974a94761f58b6b43d2c7652ed44cf5f6d673582664895ca445bda5710
 EBUILD openjdk-jre-bin-8.232_p09.ebuild 1958 BLAKE2B 28e134f5e7bf2ea1d33c99bd4de62232bdf3e90ce129f9eb3c9dabdf04b57126baf11c13a4f475540d3319454665d8a3afb6e50cd0b4155d9155d7b0e1c2808e SHA512 eacb8f26d63f287b55c965c707780f9e713cc9e37a7cf1d2de1f92443d3e1078584972161421f87877eeb7ebc00fba40ef8dd81abc252a380fe6b9ada616253d
+EBUILD openjdk-jre-bin-8.242_p08.ebuild 1930 BLAKE2B c26055543ab618c30dcc81c66483f0160049b9dae7b166b686d9d993e13acf2c271270e32dbc403721f68477c98dea172e73f6c532ddb2d221d2ba7b22f51fa8 SHA512 2ed5de5a47471407412f8cd3d8c7ab84d5b95e174081bf0c1b501940e9b4298e0fbb591e867b092a8aa99c84c2103004fac8bbc98064b104c199c19ee3b0c4ac
 MISC metadata.xml 980 BLAKE2B bedd68b0facaa23d89578762fc5fd80dea94a3dce51e8afdd70dde4fb949168694e633564384a506afce44de11f81bc46ad33c324ff2e8e4c37b2fafd246bac3 SHA512 fbf6411ee2bf3f0aa6d7f475a883c7316b87fe20c54ee43200034268a7f57f8454e1aba5ce272645e08ef41dc35e61a4b965543215ed8278c4b8606fdbaf5f00
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 1ad7923a9f51..928ec4e19725 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,9 +1,8 @@
 AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
-DIST jdk-11.0.3+7.tar.bz2 90300528 BLAKE2B db566140028ddbf9f6e10eaaac018ddf3ad13a954500c73abde8aec5c673c375f2cf0e56bc75c410a4ff90e6cb8e9c4580bb5719786e34865f00a92bd3ea8431 SHA512 46c1c13165e7d5ef480052810ccdc1b5d55f6b2b542e10303d3940536df7f17bf3d8a0cf774e73dc25af7cd69432790656a03c66d2df9efaf71cb9e44c2da684
-DIST jdk-11.0.4+11.tar.bz2 90420043 BLAKE2B 28e7ea146a14ed4629a42c69721a9d53a1c7d6a0346d96bedf15c7f3472d39b0b1d303ceb0c80dd226ba21236588a3c1222446bf98492235f9c18ca870eae26a SHA512 5211aa3d8b1215574b75137a6645ec1a3dd833a9815065f04cefa00c26d2aa6028074076645a22af2a6ffc1bd39cfa1e5e92d9ee3f24af32f9de914cf36b8056
 DIST jdk-11.0.5+10.tar.bz2 90613232 BLAKE2B 0a3cba851ac967d84f97ae1e7972d3ab593dbc76fb20664c4e7950380ad91acee7e263a2989930b45346cd170da71c500db9d8a0a6ac88982d77607089b95513 SHA512 0d52c78e217b79756be0fc6b3f9204bae254ec7b9ae10b6c3114463a9c028143807f4422711f0c02b81a034ae6e88fa2efc6bed85022720807344230a8aa12a6
+DIST openjdk-11.0.6.tar.bz2 90755968 BLAKE2B 5bf23cc107ffae4cfc82be4f9b4b17de57575ee13e8fd461027e319a441c89c65fc852affb89f98a54307fa865ed5cdfb216809c6196866b31dfaa7011ad3d57 SHA512 d2296556c947c46883c16df3c1b7d809e6987dd6fd1a2667333e1245049560f3da744f6a51609a918cd9c509316b01160de2c080d5b9d3ed1af0b312dcbc575e
 DIST openjdk-8.222_p10.tar.bz2 452194 BLAKE2B aa5a19245e9b5f79da217ef4e8ff87acaf6b4c7b930a6cd1c7a00d2c6d50bb3168c41da1b18e8beb072a84bca7f3956e939edd9f5fd88899d2cc3fe754ff19f8 SHA512 08f92327732fb54df847fe0b3e49460bcdd25fe2aef7bc9545d75ab6504ab92452f8f5daede6040d28fd9b8347f49d658dc7bf88abc90235d6cf4a72cb44fbba
 DIST openjdk-8.232_p09.tar.bz2 453185 BLAKE2B 9f78dc3a482f42937c9f4ed30492cf8348c903c6a419a7f2644251f853f92e2e112f72c16848adcc7102f41e8f1249e35d7019bf0b5c5fd823e4f068650f36fd SHA512 31fbaf8334b3a40f491ae87aeec5698ebac334b8425147b8f8fa1a397e64f5bf7025d22dd5ecf7c7029c07ca40424f07ae139aa5d9737b20a6eeec2e9a1d835d
 DIST openjdk-8.242.tar.bz2 452896 BLAKE2B 73176533ad62942f9a9547378aa5547a5f064076d24be527d0fb8b13c30a48680957bca731ee54771cae66e78f8800995426431ec266f0c61330a573efaacc23 SHA512 2a98dcead63b8e5dc6db841416b16c12a84f557c8efa6272bc4dc125333de1e20ab83050d1ee441a77f78b47b2c52dbc7d29810ce562218129eff29a5c79daca
@@ -28,10 +27,9 @@ DIST openjdk-langtools-8.242.tar.bz2 2397745 BLAKE2B 94748fa5304217a6354b4de29e8
 DIST openjdk-nashorn-8.222_p10.tar.bz2 2859130 BLAKE2B d43b2e05dea1f97eff9e6d81ac0a6c8bfbe8cd444ff23df4b7d2fec29b678386893c169742a80fca6f0a785189796d2a6f29c10011a835cf5ac9e74001ae2b72 SHA512 453cefcd3f34cf6fca9bb14176145c9e4620e4188461b49049e5363cd62d87cc4f7703356369677dcd1e4862de0b5c16d1c505d66317944226a590af56026ac4
 DIST openjdk-nashorn-8.232_p09.tar.bz2 2858464 BLAKE2B a75eb94f81c4d94bb5df6a0799ce447a5a382753a95579ff0dc20e171233a84737067edd120412b14ffc93e82290998a2e8c4de6407888e7bae1f4d226034c38 SHA512 6e5d12b75735b1c51048b0e90e7d977766ae4711bccf139714e19f773e2cf6532d36492168ef6ccf797f86cb11b22b0bbfbb53d9399265a58b08ece702e96a3b
 DIST openjdk-nashorn-8.242.tar.bz2 2856246 BLAKE2B 87343677e79b13baa0181b988f248f1dc1ccd265117e407e5be8d848813322a0e7cc53f5ea50bd7796b06b9c0b07320ca1b0ad8623f690c5bda3a4519656b6d6 SHA512 3f5fb2917fc65c85f007aea7842d0f1fef6c20050ef66a593d7ae25ced38a9eb5f1a4bb3c3d6b9757832a7d450d1cde06f98e383523707d93046e34ee70814c6
-EBUILD openjdk-11.0.3_p7-r4.ebuild 7411 BLAKE2B ebccff73dbd5f3fc76f8d8097bf2eaa5595b02b664de276d6be6604f72bfdbef0aa3928803e70aebfdfd3e73b0146f09466c4e6f9592d604af62d8fc65d7853b SHA512 b8aedba3ca200054a3ca2e0fa1142766ba5ffdbdc946ade7c61e4c19373b8ab47285b25a76e9d6740432e25d749dc5d379e218081b8cf64e2cac79c8c181a097
-EBUILD openjdk-11.0.4_p11.ebuild 7532 BLAKE2B 9de8fc795b96eee82e2574c811971dcbe4ab9c291170be54ae91d8ac97654ac7889d055dbb3f186776964309e47ef10cd7cecb4ee9a6ca8fdeabe3ea725fa170 SHA512 6f49ac621b017fc14287709dc8e2665d0944a4ee9a3b50e4bdbfdd12e5a1ba1532f5c228d8dbc5b07ec0e33c665771fcc33829e1f262eeb9b573aef6b6def369
-EBUILD openjdk-11.0.5_p10.ebuild 7532 BLAKE2B 9de8fc795b96eee82e2574c811971dcbe4ab9c291170be54ae91d8ac97654ac7889d055dbb3f186776964309e47ef10cd7cecb4ee9a6ca8fdeabe3ea725fa170 SHA512 6f49ac621b017fc14287709dc8e2665d0944a4ee9a3b50e4bdbfdd12e5a1ba1532f5c228d8dbc5b07ec0e33c665771fcc33829e1f262eeb9b573aef6b6def369
-EBUILD openjdk-8.222_p10.ebuild 6841 BLAKE2B d7a8f87ae3f1661a970f3f3ba8e0e996a317069717b119365789b2a514e7349c294e05414656f069132e3435ad887128e38d84f9c2a536868dce8946e7187a82 SHA512 207c9f7dab1ed4afa6838c614d4db44afd856f1d093d0425d4316c2d46431d9e790f38c6a4ce6d39b39c5ae878dcff9260743cc787b2cf22b0053831a0773496
-EBUILD openjdk-8.232_p09.ebuild 6837 BLAKE2B 4347c1e82b103112b5c72ac9bec80396214ecf6d9b933782912ed27403c92bff11239ffa967b95ad9ca1b181bf04c4ed2b01f97598a07e67c806b0f0342bddd5 SHA512 c43b02291aace24ab806d143cabfd29106c7a8ec16d4e44bc5008aad1c50b7fcd1362e732fb3265af6cec4e7ff5f1b77d8150477ab5917f90d8b962110943266
-EBUILD openjdk-8.242.ebuild 5811 BLAKE2B cd7eaf4a32d78d47cbb9919d0ee30e6f05322df97ff09872b9b9a413979f489ceb89a8c26b7ecebb3df268c874543b35faee96f599d5e3bd45f7d50f7a41aabc SHA512 245eeef5d91967ea115cb1dcc8ff9a4c3869f9972a32f4147385f9d8cb867804d618aae21a0511fcea2ebb400f3f42be7fcc348436c0ad53c44f5f68e0daad3f
+EBUILD openjdk-11.0.5_p10.ebuild 7521 BLAKE2B de076a9b7ccb2eb1e179e871d276504e2e22286e9132bf85dc8242016ddde90c2f4b6f0946e370e22b43846d1dce587b38f591d3c20dc703f4b263c14a982288 SHA512 eafa0f8562ca4aef4209499e6e4ce1e40a11317fc16b1a8cee294f42ef7d3aefcd4d496bf5854f1cad3ab8b4bbb8d21c901265ee70df09f627ffb4b88a9ecc62
+EBUILD openjdk-11.0.6.ebuild 7539 BLAKE2B 386888c85dac344cb07c894e7fc4436f2ea9408480eec628151e5bb2f5e1a555072f19fc64b639e6e91ab7ede6b7b2b78c5f97a6af8893edb191f075250211f3 SHA512 0969dc29ef201638ec529aa5d88da3e8e6e4a3615ccca2d6db313bfcd3e61debc55c5be166fcec1e239a4557af45d7a195d5428768cbe90ad12be716fbad2146
+EBUILD openjdk-8.222_p10.ebuild 6820 BLAKE2B aeef0d831bbc35a4fea1a3fbc68be8af17eedefb5f3132fc96c7f7e062b5e3eaad30f3c8a56aa3f72ce1ea768211118c6964f4980c4d7d2936d9c521c100229c SHA512 66f73bd50b960c2ccb6956fc4af216689afaf2bb70df0dc58ec1751fb4831df3c705800bc15816630386f91840eefb74338d2efa163755381487bbbb889eb7d2
+EBUILD openjdk-8.232_p09.ebuild 6816 BLAKE2B 0e260daaee8fae0ecc2987928d47d8239e0b16e8a2673bb67d6c3c3f2dd6d59407c58f431cad35d8234631a927d9c990679f0891493e54d08cfd829eeaa65607 SHA512 81bdbaa7469dc4b805abfb30e1a5ba4dab8b4ee039da06ccaef0b9b0a77ffa18544da7e9f1f8c9e370eed51e2a8ecfdd6372c1abfd5d67b8c1624e3529903ded
+EBUILD openjdk-8.242.ebuild 5790 BLAKE2B f1056bc5f24dc464e5a16e82e0f8a86fe13c5763fbd84264d5b4f3babd06229acc94b7575168495090dfdcb23a35e25df4634d69188fa24e611b413004c273df SHA512 dce306230e2460c40b0a33a58454947000c16ff65aa6e714a6f71ac3221b242ee553a41becbf3280ac458e53d938d66e9e41565f47950b8d5489192579f19c14
 MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
deleted file mode 100644
index 5bdff86cde05..000000000000
--- a/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	virtual/jpeg:0=
-	systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT} )
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-	)
-"
-
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-"
-
-REQUIRED_USE="javafx? ( alsa !headless-awt )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-	else
-		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-			JDK_HOME=${JDK_HOME#*/}
-			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-			export JDK_HOME
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	local myconf=(
-		--disable-ccache
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-giflib=system
-		--with-lcms=system
-		--with-libjpeg=system
-		--with-libpng=system
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-vendor-name="Gentoo"
-		--with-vendor-url="https://gentoo.org"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PV}"
-		--with-version-pre=gentoo
-		--with-version-string=${MY_PV%+*}
-		--with-version-build=${MY_PV#*+}
-		--with-zlib=system
-		--enable-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-	)
-
-	if use javafx; then
-		local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	emake -j1 \
-		$(usex doc docs '') \
-		$(usex jbootstrap bootcycle-images product-images) \
-		JOBS=$(makeopts_jobs) LOG=debug CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	mv lib/security/cacerts lib/security/cacerts.orig || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		insinto /usr/share/doc/"${PF}"/html
-		doins -r "${S}"/build/*-release/images/docs/*
-		dosym /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
-}
diff --git a/dev-java/openjdk/openjdk-11.0.4_p11.ebuild b/dev-java/openjdk/openjdk-11.0.4_p11.ebuild
deleted file mode 100644
index 7c7b56ab423a..000000000000
--- a/dev-java/openjdk/openjdk-11.0.4_p11.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	virtual/jpeg:0=
-	systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT} )
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-	)
-"
-
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-"
-
-REQUIRED_USE="javafx? ( alsa !headless-awt )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-	else
-		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-			JDK_HOME=${JDK_HOME#*/}
-			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-			export JDK_HOME
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	local myconf=(
-		--disable-ccache
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-giflib=system
-		--with-lcms=system
-		--with-libjpeg=system
-		--with-libpng=system
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-vendor-name="Gentoo"
-		--with-vendor-url="https://gentoo.org"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PV}"
-		--with-version-pre=""
-		--with-version-string=${MY_PV%+*}
-		--with-version-build=${MY_PV#*+}
-		--with-zlib=system
-		--enable-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-	)
-
-	if use javafx; then
-		local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images product-images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		insinto /usr/share/doc/"${PF}"/html
-		doins -r "${S}"/build/*-release/images/docs/*
-		dosym /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-11"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
-}
diff --git a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
index 7c7b56ab423a..8be378782e3e 100644
--- a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
@@ -246,9 +246,9 @@ src_install() {
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 
 	if use doc ; then
-		insinto /usr/share/doc/"${PF}"/html
-		doins -r "${S}"/build/*-release/images/docs/*
-		dosym /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		docinto html
+		dodoc -r "${S}"/build/*-release/images/docs/*
+		dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }
 
diff --git a/dev-java/openjdk/openjdk-8.222_p10.ebuild b/dev-java/openjdk/openjdk-8.222_p10.ebuild
index 9a74ec428906..7f674fb94cc4 100644
--- a/dev-java/openjdk/openjdk-8.222_p10.ebuild
+++ b/dev-java/openjdk/openjdk-8.222_p10.ebuild
@@ -234,8 +234,8 @@ src_install() {
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 
 	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r "${S}"/build/*-release/docs/*
+		docinto html
+		dodoc -r "${S}"/build/*-release/docs/*
 	fi
 }
 
diff --git a/dev-java/openjdk/openjdk-8.232_p09.ebuild b/dev-java/openjdk/openjdk-8.232_p09.ebuild
index ac104740441b..4fa1e0c103a0 100644
--- a/dev-java/openjdk/openjdk-8.232_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.232_p09.ebuild
@@ -234,8 +234,8 @@ src_install() {
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 
 	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r "${S}"/build/*-release/docs/*
+		docinto html
+		dodoc -r "${S}"/build/*-release/docs/*
 	fi
 }
 
diff --git a/dev-java/openjdk/openjdk-8.242.ebuild b/dev-java/openjdk/openjdk-8.242.ebuild
index 0689a368ceb5..803f0b77b68d 100644
--- a/dev-java/openjdk/openjdk-8.242.ebuild
+++ b/dev-java/openjdk/openjdk-8.242.ebuild
@@ -208,8 +208,8 @@ src_install() {
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 
 	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r "${S}"/build/*-release/docs/*
+		docinto html
+		dodoc -r "${S}"/build/*-release/docs/*
 	fi
 }
 
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index a1313a5f4f7d..ab51e1765f45 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -5,6 +5,7 @@ AUX 11/respect-user-cflags.patch 8604 BLAKE2B b4455f5580a9b310e013c0d58ba39a3d9e
 AUX 11/use-system-swt-jar.patch 608 BLAKE2B b0083c54f5f42e6c0069812913c800c9366073e34a401187e90c498ee9cb67b619baa87b7d140cda5a1330076c3b04ff3114898cd264cd51ec4b99498acfd894 SHA512 a700c33639603a26d21b89a4f8a9299cdf42cf7f7a0dc082ec9cd4c9c2235184add1685b05d2a62f3a52bd2251b4c133476e5944471092a2c0c269c973d2604f
 DIST ST4-4.0.8.jar 239543 BLAKE2B 72d257c6d0f1b3bde0afce805128dd38d8520b2073377bbb995fed3b4e18a3ea69d508d6d7554755ec68bf50940082b896ed89998a5178272d24376404b389c5 SHA512 9877289297cd5b15ad464a19467699387f57c510fe8a476e07e9d2334bd11933f9bdb9c6caa4972d4d4c84b56740c6d885cd39300dd7ce35b7c5bde536238086
 DIST antlr-complete-3.5.2.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
+DIST antlr4-4.7.2-complete.jar 2079769 BLAKE2B 9407e5096b5943702a1375f568957f35486a80f122bc59c5ec8e899f59214c43ee4ece551d9078de14b7707d85f9306ae99953981c755a1e1205d83412010738 SHA512 e788d28796c8925a158f0a09048590bdcf6730d46dcb8a12b362cbcc80a7ceb76374b2675987c953faecd3cf4a847b1571485a71081a84684170d25d05176a11
 DIST gradle-4.8-bin.zip 75885015 BLAKE2B eb6592afe122690f5e013abec2821beabac070563556ceec67ce02506582d4d9ac9c5d9f97ad2c464e442446f26ff90e9ead2c04e462a564411259564e3332c6 SHA512 4b351c9c5b0970bafb3b2b9b9e2ec9f37ff681cc3ac30004852d712cf8bb83061211a58e5b1f101813cde6a0aec914badf4ef0a806eec603418b851b64a06882
 DIST gunit-3.5.2.jar 287425 BLAKE2B 86e759c5bb164758b689d93bef4b6a0bcb39eb9fee28d2a8dc113a4c97e5e8516b55ada87c27738ffa0fc512805caa338d8649f6f5c9ba36490c4c3ebed86fdd SHA512 c9f14dacec2f22f62b7d3849d1c0e9d626b3dc20eb74a85b32f1901f6279b7b84af095107128bcbe80c49ac05448a713309b60d0c3d2f88e0bca8a14690292b2
 DIST lucene-core-7.1.0.jar 2779248 BLAKE2B 9edea1cfdeca2f2ec9e5c014e575774dc32fa5cf12ba02fd419fc252da10c03cd9f6cda989203211de4bc2ffcd2e79e8b97914e9792951bb0877a203760f07ad SHA512 0cd96016de2bc7ad94779e30348c443cf6028119fdae42c6f29e33d84495876a7519640f20680762324ea40c42e21b595f79cd606a6142b9875501f1e9179678
@@ -13,5 +14,7 @@ DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b
 DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
 DIST openjfx-11.0.3_p1.tar.bz2 63272033 BLAKE2B 574a622b2b2587fcdc64c91cfef0fbcc6d97baa7827e84a540bf1c8493b9fbc3629bd131e5c0972fb82687d194ceb527dfdedd6c2a00edc16d9a76850699f9b6 SHA512 8f8e07d7588b1a5fbcdfcc2837ae0389fefea3a1d91f89fdd4aab03e0bc6f5b9a1e66a824ae9388b777b36e76beb19cb6c69c963c7d904d36cad40f36c5ef0c7
-EBUILD openjfx-11.0.3_p1.ebuild 6377 BLAKE2B f3382411d65c0b93b8c53c617d0c3aad57457e8352f22948d3f421b92bce258a456887870781959e99173291cafaba9804f80aac4d55b7f3ae534c87b502cb3e SHA512 3b24289b423f9027374d53cd47aed78c62ece77529edc14fd198b312fbb0caa34100f348610f74ba01bef255a11429c106fa3f53ba6644c651886b918aa45476
+DIST openjfx-11.0.6_p2.tar.bz2 63971065 BLAKE2B e68cebef34c39b163bf9de5f7184a363553650921bcf86ea338d6cbb583cc66056c3f5d8ff593b320ee38afd9daf738ffe041de6a90062e35e59274ad0242c9d SHA512 7112a7f4a02f36c131892953d76f6a8d82bdce69b67479091187045d78c090f6b4bc8f21b6df259f154c3d0ae87866566eca50ef2741ed440d62655c36e20f3c
+EBUILD openjfx-11.0.3_p1.ebuild 6389 BLAKE2B 826e4c64d3e66fe2683377234008d37f4252bd26bfea000fee9fd5bc0c46a9ff2cc282b6315e809fc4d2b6f67abaec72b6341b31d42964add52fbaedf1573976 SHA512 a2a7306c2a17ff095f8a8e91c87412ab0efdd118b629ba06f437e6069c4addee30b85ce9ca19fa9dd75ece02802dd48ff388acf0b7569fe589478b31c8802b85
+EBUILD openjfx-11.0.6_p2.ebuild 6338 BLAKE2B 1f2209740f584b046654632ef7eee60559cd1b08cebb9ea4ec8612d3246e005b5e24dd54d15c14a3f6717aeabb5aa8b620d645dfb90bda560930657c11159083 SHA512 969d3ce35d3203697c9b4c01ac7ece913290d5421a572c9d5f6cebe7226400031f4afa33d6c8fe46961b6126505e2470fe1a82871c47ba695ff66f8fbe5a7df1
 MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d
diff --git a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
index 02d8964eaea0..8298a8316d0b 100644
--- a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
@@ -215,6 +215,6 @@ src_install() {
 	if use doc; then
 		insinto /usr/share/doc/"${PF}"/html
 		doins -r build/javadoc/.
-		dosym /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index de047f3c8fd5..a5cf1cb1a40b 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 0b8924f5e9d0..926432001088 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,13 +1,22 @@
+DIST go-darwin-amd64-bootstrap-1.13.6.tbz 119343506 BLAKE2B 005893a0d9c0aeb0fd75570564d097c5876483b1e57b5d74b04bd1b33faf916cad9337685d06d8920f2a7d1c79e67b671ce499a56b84259cc5fd48fe93cb5015 SHA512 1d45fffacbdbc2a89960d606c907d60b1ec175efedb109ad40236562e7e1a090f8be36aa790dbc7c31f4474cd94d4c5be25bbc68900a81a39393e753a5a06dcc
 DIST go-darwin-amd64-bootstrap-1.8.tbz 55053831 BLAKE2B 7d87ff36b0e13b3b3c0b8ffc4516493e1a6dde1287675b85b591c1d0a8438c9cb9c8991dc53d3c94c5ebb26830da1c7177ef1f90c250c1efeb5868020abcc660 SHA512 4cc24d44c84c94feafab021c0977fcea2aca8f191c6395e38fff68154b1e64efc3f94331c3e36c7b69901af58e9d53545c682f0a742d36b2d230508bd69777c4
 DIST go-freebsd-386-bootstrap-1.8.tbz 53739013 BLAKE2B a91e0a6b601aadc965f774ffd25a185e1f300e7194e969337f32bf9cb3056769786d92ef697271e7434d72c04d9d6780bf0fb3cb70efa83fe53cc18dc23670ec SHA512 c92f849b2d92401657412cccc589042b2747e55b2f4813d674c5bc91c3f535ee60f8ed7b8cbf1320e216d22a16dade8b78bb8071982895901f2b3c304e38f478
 DIST go-freebsd-amd64-bootstrap-1.8.tbz 55103927 BLAKE2B 30e4e4bcb43da3a170f520b47cd032a524d4c4977a9c76c4d597bb50e21a3ad2ef764dec15085d97cb5791bd483d8fac10ef5949c56b46e7580468fc9c90a78c SHA512 c7d50731ff41147295ef5f3233aa1404081b47e786a300e1d0e4db8348e56bd73fe5f169fe8b807ffa37a53683e3aef16ebb6e877d802b86ff1a3d5d3a6f44cb
+DIST go-linux-386-bootstrap-1.13.6.tbz 116991833 BLAKE2B e15c4dd3c9bfb233f81d318591df5cb2a73e033a088cd652371f6933b8732c7d5c1292ec8110b23f85b30d5afdea97e798b264c61f5651db08c7ac903e8dcbb6 SHA512 114c2f670f21624f0dfefabb99b7263e2133e58c2072ce341a6ea604278e22361779f2e0d3771b7a427e979d7e34f3fc3afcd0f8297d778c3552858ce64ec0c8
 DIST go-linux-386-bootstrap-1.8.tbz 53843745 BLAKE2B 6bbb6df7ea0f7307386590524261f9ec477e7032171020ac3ed4a09bf9c39075ba4143c466611b0ab28cc4b494dec75063ecb291d2166a82bc7601562e7e3685 SHA512 b456f7572d04c805a6fc756647c050460f76e5404dba41963c861c92f1600e9fedafe181a1f69132518065737a88edb4b183ec8c3ca24bc8df31279117e92606
+DIST go-linux-amd64-bootstrap-1.13.6.tbz 117191408 BLAKE2B 186212e85b67c5f756c9e85897e310bf9bda4445f8deae1e7a0249ac9d666723dba0796a41b9aee4487f214e1b579157b5a68f3f7aca8fc71199c8a75c5024ed SHA512 ff8f550eb98a2c6e8c046b232dc06ed9f40b99d5f4f9324ab0a6bff1b3402f6cfcb90ce77d8dcabba7a84ac643aad3daab9677b2861b03e72845c4fdd39dc383
 DIST go-linux-amd64-bootstrap-1.8.tbz 55399105 BLAKE2B 2a0b101b9dfd9db8c62dfc12418a7b03d6a346de43f7c75a8272d05ca12c36b4844b0f631199c5944a436e50aeeb6cd591323268ecdf33ec2412283efab8c59b SHA512 89d68cfe0e6ce4be690cf52a4a02b17ef2cae3538b057d4690bfd6e93727bcdc1cbc17cba3403e652bb95bffd25d44bdd4efd0014d1d2f019838bde925139f57
+DIST go-linux-arm-bootstrap-1.13.6.tbz 112330829 BLAKE2B 027cf3af2c89cc82fddf23748351214e583539e2f6c39dfad86a1e19989f4f96e8b02d41efb0e3ff88ec1e1259e877afc36a5d9562bc30f2ef9c630b111a8e22 SHA512 051770f8ecb0dfc062bfb273e0d58c855ffc66e31b066c973b0745734c404a073d9b67cd36c1ca67977061e976b17bbe3109ac16a1f553ea2c8dd0625a3146b3
 DIST go-linux-arm-bootstrap-1.8.tbz 53948103 BLAKE2B 515051e777ad273999c82f31b8a07ba61b77fbeede761a72b52c0bc3a7b55da013b5061af03a1b9634bf7b44429d7b371b89be85fb9e4f3a23d4d1a3c52bd90b SHA512 98ff0dbdb2aca9e54ea5327c9d31ce389e434a887015ef8555a8e85223a9998075c5013045275fb995a877a8d247704a21d726d46df7097adc0c4aa03af4cd68
+DIST go-linux-arm64-bootstrap-1.13.6.tbz 110293216 BLAKE2B 7281235a73dbcaf9145f57ccf5a92d046bc3a055e0635f5462f11fb82b88c1a0c5a910a8c03afd46c818e35501869190a78de6190817758367e46c89858f084f SHA512 99d47d54648936692ca0b7e42aca6d3b5feabad1d9ef42959df63dc749c8b8602ba5aa34538142678dd8285e47f7a9e2dafe893a6784db6d7eba12af2257658c
 DIST go-linux-arm64-bootstrap-1.8.tbz 51947002 BLAKE2B 5899f5d304031eae96b66ed7aa21f5af13b0fdfdcd7a12095bda2eff0f5fe5610135f9370b34681e4c33f33c1e0428a2a09c1c8a581c6b170da223f57cac4607 SHA512 adfbe62c5594c267707078bf8afb94a793dfba004c04a1a60f96d023d96c2fc4a6a422dee93a0f3487b1f2e1e117c7c6c607b62126dd5535686aaed88f6659d9
+DIST go-linux-ppc64-bootstrap-1.13.6.tbz 110762916 BLAKE2B 19d44da5bcd1f4832772469beed509475f9a38ab55b386490faf1b270ffd7cc13d315dfe4746b3b9ca6a324c0e6f2e0144a3146d43bd6210d0479063f8627e34 SHA512 2a76c6168d7ba0c7eb020a1af4eccb2a5aee510a1f8e4bb438f5ea769677724c1450209c2fc9a4ccff1084f1a091a568e667ec33a5d537539a09ece426cf82d8
 DIST go-linux-ppc64-bootstrap-1.8.tbz 52315782 BLAKE2B 6be0a48e8bc4e5fed4d34f8aaa8dfb6ad4d513064275dd940d0f58b25d442b33ad71c11687d317448b93d9c4690f7412e5a6a4553ec5298663409416cec04fbf SHA512 0aa32ac1514055ed9140b8c8330cbdbadfd9da6ad00b60d49b0685473be21e0b6510c31394678e32048f2f38d06a0d575f453c555614664eaef2bf5be6c91734
+DIST go-linux-ppc64le-bootstrap-1.13.6.tbz 110086770 BLAKE2B a3f2c1b840f85d7726336285a56d1850fd10f32d90341836a4124a7d181778c3a1cff1d576e4a19a4f3556e961d84fa77202891725b5237121040bdd020af339 SHA512 6c4bd54fafea65fbb16a3e6c57b721c10654a5f18879c164f6889a01ec6581b13b450622e83897032ab3ed43a9ff4a7edb6d30c56d41dd23991e8453c1bae359
 DIST go-linux-ppc64le-bootstrap-1.8.tbz 52211575 BLAKE2B 7a28ec5a381369c4e9415c8360e904c2545380513afd328077c584e8af0bf6bd818aa03e5a58c350cbb98facc1c9dccb02b06adcb27233875497cf5d33265912 SHA512 6931d999dd0ee1ff44c4cec48acb27af061f57f87aa74802dcebab78553b46bc8ac732f07fe91e5074dbdd32c55b707994875934bfb12bb4276d71eb1d06c4ba
+DIST go-linux-s390x-bootstrap-1.13.6.tbz 115641137 BLAKE2B 7ab94a8f7c839ee8fb58673ed5ad00a569a0bae7a13bb214098154aedb1c272837d0903c226cb87b5eb46475589ddcd56e1afafc81ddaea988ce3c3ddca686d1 SHA512 794b72f48634a7f7dfb41c64607d66974ef9413a68e39a3959a981e2aaf356fd2cec9e2eb0c25d1b7b3d179c0a72ce053dc9c69463bde0ec893ab472f7076204
 DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324bbb30a383d599e31a0d2093d24797dbcd0e799a662a3589dbb87d2f5dd16df07c4cf8f1e444e87b540ec732746bb025dc9271f8 SHA512 d429cae870d66217ab2e07c74209d3031d97baa4f899b4d70ae6283a1a5b1434b037904c4cfca0b2bc798d5ba0b358c3739e000eccbc74809baf564c5686df5a
+DIST go-solaris-amd64-bootstrap-1.13.6.tbz 116214396 BLAKE2B 3f5d6fcf2131a0944b2846eab2fc069f5d90fea1e7d98e8bd50ba5091d4b2ae01964fa71c29310fa7ff7c990ca0dd1afc83577174a46552d58d611716fedb854 SHA512 2d2c281c196729dd97f338fe3bd7396268c0b6fcfc8241b99a939f647201ed39929a5b0a096b9d1f7ffb20f79fd7b3cc25127d7a93f9836f6f0d1e5dbc2c6235
 DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d
 DIST go1.12.13.src.tar.gz 21980338 BLAKE2B 205bee35a947ccd08f36547530e3de7928f5f3970be89580ddff80f7710dd1dcf4f292c10ec93c27717ce25ce2575f7151129430b80d1fb927872f891166d8db SHA512 a8210ba909c1bb26799625bbf648204dbef5a9f91af323277f76caee489f5912a08e9de686b71fe97d30c7dc171d5f4bcf8a2c2227d02353cfbb7d292c9efc22
 DIST go1.12.14.src.tar.gz 20726032 BLAKE2B 2defecd29568974c1618ce0da42d9e28ef41904ed3f759b51c7e392ed9dea950a4984efa333e52b413fab3dac8270bb99f60e113712bfc648c4c9af0e19aba7d SHA512 6cd225282fbade8bd7e96789744c7db07f223f5309358ca3768c95c34a099b44bd9ba9adc2ce293a5bbd608237ae6473b86e7bb451db395c647809fc2750dd4c
@@ -20,6 +29,6 @@ EBUILD go-1.12.14.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde68
 EBUILD go-1.12.15.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f
 EBUILD go-1.13.4.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f
 EBUILD go-1.13.5.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f
-EBUILD go-1.13.6.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f
-EBUILD go-9999.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f
+EBUILD go-1.13.6.ebuild 6323 BLAKE2B 6063178a19028e32b7e0b3cd59db2fed1ecb407c143a3eb1454dd415d57ccc27e497963202618ecf9b1b7fc4710fadca7a07b52034dd9613b145439e517522eb SHA512 8d8695333aac351a93908329a55f7917dcfbac8f01e35121b9bdc4b4ffbef25ba2aaa2cb8a9f6f37132d5a4bb62da8d825699eaf6e0139e627db77ff28382f5c
+EBUILD go-9999.ebuild 6323 BLAKE2B 6063178a19028e32b7e0b3cd59db2fed1ecb407c143a3eb1454dd415d57ccc27e497963202618ecf9b1b7fc4710fadca7a07b52034dd9613b145439e517522eb SHA512 8d8695333aac351a93908329a55f7917dcfbac8f01e35121b9bdc4b4ffbef25ba2aaa2cb8a9f6f37132d5a4bb62da8d825699eaf6e0139e627db77ff28382f5c
 MISC metadata.xml 663 BLAKE2B fc92966e1b4a155b4d442842988d0404c0148b029d187ab7294d49dabad771296d63ca3184128ac27cea4e74e7d6cfc8852084ca8f1d15a1d0755586a0bf68de SHA512 f67b7e312cfb2a896552ae73e835d53ffbb0a7c71c30f0a7cb44c65e2753055e185e7a5c48e2cfff33a42609629cc3c32ee56a9d8f61d8429798c1e8424e36bf
diff --git a/dev-lang/go/go-1.13.6.ebuild b/dev-lang/go/go-1.13.6.ebuild
index 5e3547cfeada..6263c6c48eb8 100644
--- a/dev-lang/go/go-1.13.6.ebuild
+++ b/dev-lang/go/go-1.13.6.ebuild
@@ -10,19 +10,17 @@ MY_PV=${PV/_/}
 
 inherit toolchain-funcs
 
-BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_VERSION="bootstrap-1.13.6"
 BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
 BOOTSTRAP_URI="
+	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
 	${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
 	${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
 	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
 	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
 	${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
 	${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
 "
 
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 5e3547cfeada..6263c6c48eb8 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -10,19 +10,17 @@ MY_PV=${PV/_/}
 
 inherit toolchain-funcs
 
-BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_VERSION="bootstrap-1.13.6"
 BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
 BOOTSTRAP_URI="
+	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
 	${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
 	${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
 	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
 	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
 	${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
 	${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
 "
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index d6ca7c47586c..4515607f6f35 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -13,4 +13,4 @@ EBUILD php-7.1.33.ebuild 21952 BLAKE2B 308fb26d287263b32ee5468a2d54339b6d90da423
 EBUILD php-7.2.26.ebuild 22483 BLAKE2B bd71d1f60ba8948eb0164ab93f0ca94b3ba2b8331ed011c0d45f8b50567f733b364afb262b5407e8d8156dd4a52119c7f3e4bd76f1a14f2e4807db2971c86d88 SHA512 4ffa41f250c445e9172fbc7348953453a22cb360d1e106c06922bb665f8a8705d390f57f2170973319e0ab930aa32592365865a43bdcdbd3d78751b18b3f0c18
 EBUILD php-7.3.13.ebuild 22495 BLAKE2B 95cc23e098281aba451c63cc02fbf8fb61f80e8afc65f4b3336ad2632a5c15ba9ce11c5af439368a837b6f82a9a4d73677ef080c651cddbddfe7f7496c31dbc2 SHA512 696ae412747384e80f05b015b33072621a9d4105a022a7b9b951ab5133ea072149c7cd6ad3414822e5abaa29d28ee9043ea041d80965cdab2bf87c8eb0b474d3
 EBUILD php-7.4.1.ebuild 21183 BLAKE2B 9762575bb045ac7121a80df9e54ad5d25e0f033340bbeb9beba62f4e3744fa08b1d865e3a3febec6a20bb991fb8dbf0de9d4083a1b938178120d8778b290a1e0 SHA512 de0bb4a496ab689ab35ae8ef487e55591715739abfe9e2ba48aea27e5a3470b0817dfb2c332b501a21e1b305ab39a9c2933d8e4eeed61ec480811e118c9642cc
-MISC metadata.xml 3103 BLAKE2B 539d1725f936871d02271dc355e837dbc051e1c7c480c3ce46c897820a89af10f73a83350145bff9991b47ce6a9f9919f7d3948a6997a523b4583ed08c8d9de6 SHA512 3799371bd28fb31292b691440b67940a03d16657b686e0f3f45ff4367214a7534842532cdeaf3e05ba31a7825d3cbb60ebc9b93325aca717d1fc818de9a8ea07
+MISC metadata.xml 3216 BLAKE2B 6118c94f2ac3a2f283eb035cbbacb12343476b4ce22594a00cb7ebf063abb106a0ed5557d311127b8c1e2a53263103ded790cd12d20c6b410ab6f7d218d95ed8 SHA512 ffb0b46b30b1add0fc166e3afe1317e70041a0fe849d4c05ceee011c1b5e130fbde3b86eaf876a4c8a2d23fbd7824f95299642b4f60e129436befb00f4b124cc
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 462b7c8d5b42..d7afaed7acd0 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -5,6 +5,10 @@
     <email>php-bugs@gentoo.org</email>
     <name>PHP</name>
   </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
   <use>
     <flag name="argon2">Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg></flag>
     <flag name="bcmath">Add support for libbcmath</flag>
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5701f772fe83..ea888460d84a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index bea6197c213d..b8ce803782bc 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,7 +1,5 @@
-DIST libzia-4.16.tar.gz 623606 BLAKE2B 48c5eb65890c87ed48bfaee60a6683f5320c561c8f6bf55268690675e388aefeb52e229c16430b9ff04b8ae29749e52beb71ac7d7f0642f4fa255e1bef85b452 SHA512 cbf0e678abadd670acde1778dcb137a49ad11f8e8d8d8465ebac542deb964e1c138b65ebf61404ea0219e17cdb336585545eee3f63d4e0ac41bffe0010f2c2fb
-DIST libzia-4.17.tar.gz 626840 BLAKE2B f63ba0712dedd53736ae297f253fa6fcb3ed5afe8f374c33a45cfcfb36e942192ae5a1f520deaca8745ea2a9d990307e984ce2b62894514332dbcd1ee78af977 SHA512 8375cfca8b61c78a8d355ac2d0e329ac0ed3f61ed3c902dd6c3ad202fcc9a1960ef55c4389f46a0d2e1423d060750639eda3d196dec94c9a53b7feba902d5378
 DIST libzia-4.18.tar.gz 623928 BLAKE2B ff7f4873f77c1782bc704ff11f0fcdc2a479404cf0719d9156fad2ad01634241f7f556699d778fbd6e3f4bfe108b1735c65def859d56cefcedd6a3c760200a14 SHA512 7d4287cf6804ae757d6c96c03fd948db1bf0b5463d345929b2c8dd4540e66b45849a8096500576199fa650b63b892ea17c976338b88e9310d64f804fa3920489
-EBUILD libzia-4.16.ebuild 719 BLAKE2B e89d28fdf28d1405fc39d7eabf559a3dd3493cc1436752fecfb4e73386ba4c73b88907736ea9b1f107325c2bce071b696f84e2f880ea2c4df4535ca57b6a9ca1 SHA512 0c6653c16bbb1136bccc3e6d672de98c64a7695dcb8a38ddb7acf93c0d1b61449519cc0386ffc270f99155ea451c95ad6befde6f3772e639c1b8f0a2dd2deaf8
-EBUILD libzia-4.17.ebuild 721 BLAKE2B 9bcf0c0be20ca59b6b89f08dcdf8bc6a890bb96dfeb5aa191e0fea07fd09f58383d23027888c5523b30e1305f299c9c1266ab9d120413861abdd4b59f84eb8ba SHA512 1cf2d7599df0022e2165282e140ecbb298701441a9e8d34ff4b6a8684e6b8bad079a738c48411b14aadccf093708c8df68dcd0d43ac324cd54b7502e3a8b5762
+DIST libzia-4.19.tar.gz 623995 BLAKE2B 55bc17854614af92873059e741179d9bc4f35000c4fc29cdd56854b85cf059d422ec49cee9d07056cf8fd18f7a6bf15aeb98a3f3dcbee44420ca1862175d3938 SHA512 65b7cb87740a3288c186f30a10d29824f2b725e54290d4c56ebfd9aa6902ff2e1e48725ed35e3ff5c2d144ccd6a20384df470c1b615c99da8a14c7e0647b0f6a
 EBUILD libzia-4.18.ebuild 719 BLAKE2B e89d28fdf28d1405fc39d7eabf559a3dd3493cc1436752fecfb4e73386ba4c73b88907736ea9b1f107325c2bce071b696f84e2f880ea2c4df4535ca57b6a9ca1 SHA512 0c6653c16bbb1136bccc3e6d672de98c64a7695dcb8a38ddb7acf93c0d1b61449519cc0386ffc270f99155ea451c95ad6befde6f3772e639c1b8f0a2dd2deaf8
+EBUILD libzia-4.19.ebuild 721 BLAKE2B 6f33ec501f2f24c9d27a0f2ee655c526bc4e758f4febec914f8f12809b687748bbb1238490e3fc3e0ab596d8a8ddd06010fb5e98c18e3ea7abc6a38e9442689a SHA512 6c4dfdfae0bf2dc34d8d237bf25767a22739ccc6350e25bf88a4ce82c48b96fcbd0b8b5d0f668d41319ba6d029fbf5c192db8a3c82a37a35249d120ada340ea3
 MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
diff --git a/dev-libs/libzia/libzia-4.16.ebuild b/dev-libs/libzia/libzia-4.16.ebuild
deleted file mode 100644
index 88159bfcae8d..000000000000
--- a/dev-libs/libzia/libzia-4.16.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="platform abstraction code for tucnak package"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ftdi"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	media-libs/libsdl
-	media-libs/libpng:0
-	ftdi? ( dev-embedded/libftdi:0 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	eapply_user
-	sed -i -e "s/docsdir/#docsdir/g" \
-		-e "s/docs_/#docs_/g" Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ftdi) --with-sdl \
-		--with-png --without-bfd
-}
diff --git a/dev-libs/libzia/libzia-4.17.ebuild b/dev-libs/libzia/libzia-4.17.ebuild
deleted file mode 100644
index 89fcf6a119f7..000000000000
--- a/dev-libs/libzia/libzia-4.17.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="platform abstraction code for tucnak package"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ftdi"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	media-libs/libsdl
-	media-libs/libpng:0
-	ftdi? ( dev-embedded/libftdi:0 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	eapply_user
-	sed -i -e "s/docsdir/#docsdir/g" \
-		-e "s/docs_/#docs_/g" Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ftdi) --with-sdl \
-		--with-png --without-bfd
-}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 3286e1952588..5c4532b3b3c2 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index 1e3c6de0e7df..11d53f5f441c 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -3,4 +3,4 @@ DIST Crypt_GPG-1.6.2.tgz 346709 BLAKE2B abced2fe8c909f06690c38884506ce03df4c5ef3
 DIST Crypt_GPG-1.6.3.tgz 346999 BLAKE2B 8402ef382a6393972a3fda7370fbd37dec19d0ebabb6b316d35783538dbc01746476977d7dc3da487876201cd678964d9572dc67a43911319b1b614004a3c909 SHA512 f1ad2560a43a1e8f5a33269bc4ae4067e19e5325fdbd8d2fc55f6cb8aad89258df45fbecedd93a21749f33024c819f07399580b1a4760f5740f26043109dc396
 EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1168 BLAKE2B 9ca312b694631f32c9f86ebd6fb0236e7705e2cadaff7e3f289e722d9896e294c14651b7e1351dc3ebc87baeddbf7d1c222db7d010c9e93cd969afee6b341a6c SHA512 34dbb4558fdfe62be822bf85f66bc9e5db61dd7eaa61163a3653a89a17e67944e36c427274cf675727cde9063b0bf42d0eed752092311520217bb18228b1e04e
 EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1116 BLAKE2B 86de30ae2835a51e25e2c5e7cf29571aaa9a6805c39ac649b15fce531786e119ee7a0e81f035f470a2fdfb79f8eaf293187e4985d61392e41e7b53859c1d9388 SHA512 45f620f05bdf26f604834f723472ef724b7a029ad4366917ceba5fe5f749fa3adb6850e523885aa3e4553844c20c018f7bd896bcc3736d546c6b27ce819303db
-MISC metadata.xml 377 BLAKE2B d87bdb689ac2ef20b8d02bc7f9db6a3f23fa5bcaae752c4f5b1b0e5bbc67251779c0204b2943d044a1ca287bb07ddac9ef0ae960eb7f543e162ef6cabcbed65e SHA512 df55d57721b34bddab42639c469517c86139d60d4a4536b26b61cb35eb688c9d713cf90f92b2272e189e360042a2322e8f87480f4554a7c3cf9ffa314d053186
+MISC metadata.xml 490 BLAKE2B ae0122e23babc3353357016c47707d7a9ec6cf92d2a981c25eaebcc13713c676cd6c283b2810d6f337071651546085db6a4de56e6decd22275de90da88181f08 SHA512 21423e113024e94c04f245071ecc0a0308672387b92f42c7f57b0d716b0d681d2008fab84cec1bf0b0d37981d5548515e5f3997e76e288d9aafee678b5411ab9
diff --git a/dev-php/PEAR-Crypt_GPG/metadata.xml b/dev-php/PEAR-Crypt_GPG/metadata.xml
index bceba1d91cde..ce4c99ce49a4 100644
--- a/dev-php/PEAR-Crypt_GPG/metadata.xml
+++ b/dev-php/PEAR-Crypt_GPG/metadata.xml
@@ -5,6 +5,10 @@
     <email>php-bugs@gentoo.org</email>
     <name>PHP</name>
   </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">pear/Crypt_GPG</remote-id>
     <remote-id type="pear">Crypt_GPG</remote-id>
diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest
index ed22479fe663..cedb333ddd42 100644
--- a/dev-php/PEAR-Mail_Mime/Manifest
+++ b/dev-php/PEAR-Mail_Mime/Manifest
@@ -2,4 +2,4 @@ DIST Mail_Mime-1.10.2.tgz 36501 BLAKE2B 59e900b99061e84d307eb46d295f843404ae06b0
 DIST Mail_Mime-1.10.4.tgz 36909 BLAKE2B 101d050d96b717ad970a6f8c170ba8ea7d94252274f0b006a266a5ef4ac9d49fb350d3bf120ce645e5a54af1f0ad0ab664c828abfa8a4a96170e7204c73dfd82 SHA512 6e58e1078292cf43605313e2402b60deb97be0b56c8eb5dbbb501cf92ca836ca4bdbc9e1ab878c89f8e59941962a91b73dd917c8e678f0944f271e5537f065e5
 EBUILD PEAR-Mail_Mime-1.10.2-r1.ebuild 651 BLAKE2B ecff98990c6f209029ea163a93d2521fcd908100cc257ec7f17189747795bcac5b4972bb5c8d76ac5590be998d2194a96ead357f1639b93bc8c3c5141fa8e375 SHA512 a538af615577fd65dcea28709ee32bda7809b3868f06bd73a1b5853e9de43bfaaed3de31a931523791e5d4a51bd0fb04ba0907da26341dc7697c8faa7f6132f4
 EBUILD PEAR-Mail_Mime-1.10.4.ebuild 663 BLAKE2B c7fec7b8724596d7d4745511c64567a3fbe6793ed1d87b4b08426222998e133c6236701231eda523e4671dd2a3cd4595882b0719d240fcf09b4a4dc95039d0d5 SHA512 b30976ca51d1fd1b1ee08aad5ef3cf5c4f5ca3522734fa73864c671412153f90d1fe67309235990cc5f802a17c6877ed28f4c6a24935b72104bcbe6e7a0d2e08
-MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
+MISC metadata.xml 358 BLAKE2B 0bfd697c80f3c64bff567b59cba40da1879b944b0775ed1d5e7fb4d80b057403dce613ffec5d5f06b46b7446dc16b3c95523f4b230b7f68ba3f6e05e502f9753 SHA512 c0a0fb9ceafd2378e774675500f9c1c60a7510a30c98f293bd5c92f83bfbe6a10b59d0b85ac6de1724b9e5deb1a7c0371e35871a8c7b9c63724df2762f3ca7a2
diff --git a/dev-php/PEAR-Mail_Mime/metadata.xml b/dev-php/PEAR-Mail_Mime/metadata.xml
index b86acf66c756..16ca6ff90970 100644
--- a/dev-php/PEAR-Mail_Mime/metadata.xml
+++ b/dev-php/PEAR-Mail_Mime/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_SMTP/Manifest b/dev-php/PEAR-Net_SMTP/Manifest
index ba499f0c888f..173bfd4c6a06 100644
--- a/dev-php/PEAR-Net_SMTP/Manifest
+++ b/dev-php/PEAR-Net_SMTP/Manifest
@@ -6,4 +6,4 @@ EBUILD PEAR-Net_SMTP-1.7.2-r3.ebuild 690 BLAKE2B 45d05a57e10c7b581e8ab942a0d772f
 EBUILD PEAR-Net_SMTP-1.7.3.ebuild 698 BLAKE2B 6a13e703e725a6b416867570c87d157575068d8af96c7be12dbc05cc23ef1694622f61d9774bbda38d7415a6ce458c35b93440d2ac0930dd682d35176a44144a SHA512 705b787e8416b122b482e93cf0d0376f32805b0e45a7d33dd4dd771d65076de7a94e73ad8992921dbf7146d0c00460463b60f0b617d4c806c3173c5695833044
 EBUILD PEAR-Net_SMTP-1.8.1.ebuild 651 BLAKE2B 4e8b2711832596a23d04afce309194e5566def419c2a1448f55ab4b5f712269b29fc56ad02137bd9533b11b3beba963d98b5ab6fdf4740a98e36bc40a7e482a0 SHA512 95c25e4a90c9e1caee3582379ef2d50be17369589699739b843e9f0643eeddf3143fdba03bf7bc99be98e21fea1c7d326aaa64a35ba4dcb410c977979f6ef6e6
 EBUILD PEAR-Net_SMTP-1.9.0.ebuild 651 BLAKE2B 4e8b2711832596a23d04afce309194e5566def419c2a1448f55ab4b5f712269b29fc56ad02137bd9533b11b3beba963d98b5ab6fdf4740a98e36bc40a7e482a0 SHA512 95c25e4a90c9e1caee3582379ef2d50be17369589699739b843e9f0643eeddf3143fdba03bf7bc99be98e21fea1c7d326aaa64a35ba4dcb410c977979f6ef6e6
-MISC metadata.xml 375 BLAKE2B 278d413ce672aa49e6f7fa3af6743d10e859cc37d4d38907fd96fe6011b68db3f5065694f6d3dd2bf179481cb729088e7e2e55c6a326d992c85463b703561749 SHA512 458638cbc2f1289c26d7c67a7d8d99fd33f7b139513470bb48f5371c9a3842f8ff9db41460e3e38eee7049f7a3c2ce54a66f919ece83d9323dbed37b8ef5f7a4
+MISC metadata.xml 488 BLAKE2B 599d14f0128115db0ec6ff80d664e286e1b28dc8b0dcd5d0a94c1f3229b3290af47beee88825567ec1aea4eddd799a21f178a05849658e2d0f6bf0a45ceec94c SHA512 4833cacc6321078ce7696ac7f456e1ed368300879b71a133eb81a804e985207f5baa10b8305dbfa716f08057b74bb374347f9211924ecd3fb7a1c44562eb8aac
diff --git a/dev-php/PEAR-Net_SMTP/metadata.xml b/dev-php/PEAR-Net_SMTP/metadata.xml
index 698c67cb7239..651aeefaa6e7 100644
--- a/dev-php/PEAR-Net_SMTP/metadata.xml
+++ b/dev-php/PEAR-Net_SMTP/metadata.xml
@@ -5,6 +5,10 @@
     <email>php-bugs@gentoo.org</email>
     <name>PHP</name>
   </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">pear/Net_SMTP</remote-id>
     <remote-id type="pear">Net_SMTP</remote-id>
diff --git a/dev-php/PEAR-Net_Sieve/Manifest b/dev-php/PEAR-Net_Sieve/Manifest
index 3cd921bd97f2..b04646f25a35 100644
--- a/dev-php/PEAR-Net_Sieve/Manifest
+++ b/dev-php/PEAR-Net_Sieve/Manifest
@@ -2,4 +2,4 @@ DIST PEAR-Net_Sieve-1.5.2.tar.gz 16332 BLAKE2B 24d385225fbf3c4bf5612927826ced468
 DIST PEAR-Net_Sieve-1.5.4.tar.gz 16306 BLAKE2B 6ecd4ef669211b01089f29c48735b7259c392510f09df9aa0f1126fef8e3ebbf83803ab47bdd37c9b798a2add4c3d19e1a04960290a202070e17ee1f8041d02d SHA512 c981ba421946cc1eb1f2101cf25cbfbbcf56b74f92a8a257b19a8b43fb04ad2d8c9d93a2f44903589bb6014c53cc6ae96c44b1c31c389510439f1f2da57b3353
 EBUILD PEAR-Net_Sieve-1.5.2-r1.ebuild 724 BLAKE2B 1d1752974dab13d24f024b21b0851da3135ea3381d245ab178fb1417ae9cca3658db389c4fe679b79bd0db92c905fcdad92f27a9460a40832b094318fc27dbe0 SHA512 efe747543e5a852a3e71d1921333a45a48f06617af7b8cfad5e5b40d048cd4e2b218cc1ce2c7b91621e04368585245f561b9ae48ca04fdddbc957b4d675fe4fb
 EBUILD PEAR-Net_Sieve-1.5.4.ebuild 732 BLAKE2B 7822cb1cf48cc664224999a6a23ea309f3c360c819a0e16a41902bed471b509ad32b058019ef503d5f356e87c2f733d4ab20cd92331c48738ba21b610b792bc8 SHA512 3853d1f1b0ed3d931af3c9e08cea48dcc9ca117be7c3a5644e4fe9fb1850a913043656d12ee3ce0022be948a16aa70f7f2505f795632cbe89e87bc4a10751d79
-MISC metadata.xml 333 BLAKE2B 5370e25ed57579f125ff29e312b12b52c76e121b83c6940bcc984e2084698ac5db9e6b9d07769f32464365171d7e06021b5674f71cbb2d465687409d4bab2679 SHA512 e8eead1b207a468cbde1939d92c40408ab9aecec4646e1fbba116fa2846340f7d9a14b4a10014021b85242f766b44ce2fc68c8111272943fbb3539885566e1a8
+MISC metadata.xml 446 BLAKE2B e5028538816946cd2671d0130a50567e96988911a0b840675d09d2a831943a315b366c6d4271f7c6c67f2dda01b256cdf53f76b322fdaae8a79bdb29f3e63b61 SHA512 0b111b55018dbc43da39aa4a87691573f540b3866da616836aa04cc9ae19419b80ad5837cd8756386f153ebc8ee1d0886f12c81a3e56440654d91dc92fbd248d
diff --git a/dev-php/PEAR-Net_Sieve/metadata.xml b/dev-php/PEAR-Net_Sieve/metadata.xml
index db20b91b7df7..75b702d088df 100644
--- a/dev-php/PEAR-Net_Sieve/metadata.xml
+++ b/dev-php/PEAR-Net_Sieve/metadata.xml
@@ -5,6 +5,10 @@
     <email>php-bugs@gentoo.org</email>
     <name>PHP</name>
   </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">roundcube/Net_Sieve</remote-id>
   </upstream>
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index c39c60d8ef0e..9801bb638769 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -2,4 +2,4 @@ DIST adodb-5.20.14.tar.gz 465896 BLAKE2B acd8494141584b0c02c2e30aa59b3916ae811b8
 DIST adodb-5.20.15.tar.gz 466749 BLAKE2B ca232e15094eaf728dd82b449cfded4f84fc773e5dbe1a06b7bb15fc18487080131c52d7ae9d77e6a401bfd53baa7875810c94b6bda615d0a836a715914de9d7 SHA512 87c6f508f49a54e436b56d47d3c0b2801f4f022876013a2ffa23e751cc4c7aa83aa359e51acc4f8351fd596ad4f5d71326204ae3d57514c4354f68669e412c73
 EBUILD adodb-5.20.14.ebuild 1444 BLAKE2B 2319ca487ac6443446d2b53a33bd731f77db4b01ca5d62d964a94deebe3df16fa527ad1f26477156b1c0073a7e0f2005a72a95e4a4277358d2615ded2cb3d375 SHA512 ef9092b2504eadb5d4b8a3a7939cc17ed4e6cb8760ffaa77ec7f3f9a1b65c94345ad53ecb33de06e7c48626ee59f4fcf65adf666eb3b4d49df59b7c15e48a95e
 EBUILD adodb-5.20.15.ebuild 1452 BLAKE2B e5286f48e8bdf5fdae03893ea87292ed6da2dffae801140e2dfcd31c1a5994f205d2a17b1f58bcf757f14f1bc6230d367a4deb007facfd097f298982529fac98 SHA512 20efbbea0b7a1db0aae61b433faab6d4ec222c8082c37a5a34875cf214794e1a104a4b5e47e84f822b43576f64233ecea9a1a19e5759c98cef28c80aac4b1444
-MISC metadata.xml 377 BLAKE2B 29889d626a5c0b8d16ae7cf02f45a0e6ebee2d633110a534bcc37c9539c4fc4b8ce15ecfd8ae3768b0f79ab34f088416b1bdb4403c7769f3c6e45477d0a2bf8d SHA512 f83ababfd8add084a2dcf96d74eadae96b35b5d71ea30a98a41b5ee3d222fcabcfb63607e4517be261bfa246d461684fd95b3bb01cb58464ff8f986d123aa23b
+MISC metadata.xml 490 BLAKE2B fe6674acd3eb6a1c95ae4deb6f4215b0c31251918cc96eef1d6c784914d8e3c7eb273b868b90d7b8585421acb58172b7ce6a54d99b6b41abfed923b6e34abfd3 SHA512 c81b170a7a9532e27707f6bccea90be62a8504228571eae8b5564eea37c6789bafcb2681e4de8cc99916e1304056121575c3d8487cc1102f13909d14a7565fcb
diff --git a/dev-php/adodb/metadata.xml b/dev-php/adodb/metadata.xml
index 9212d6ef0b0f..db62b9a48986 100644
--- a/dev-php/adodb/metadata.xml
+++ b/dev-php/adodb/metadata.xml
@@ -5,6 +5,10 @@
     <email>php-bugs@gentoo.org</email>
     <name>PHP</name>
   </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">adodb</remote-id>
     <remote-id type="github">ADOdb/ADOdb</remote-id>
diff --git a/dev-php/awl/Manifest b/dev-php/awl/Manifest
index 3702ca76bc92..5ec5e958d7c6 100644
--- a/dev-php/awl/Manifest
+++ b/dev-php/awl/Manifest
@@ -2,4 +2,4 @@ DIST awl-0.59.tar.xz 124652 BLAKE2B 45b6271c175c23597c56f3d2ecc906ffc7d32feb4d8d
 DIST awl-0.60.tar.xz 124772 BLAKE2B d24dcaa34f65720e76d8304f990c22fd0bab836b92a60e05acac39ced0924b6ce881328ca5fc5368ada4aee6b647e75406cbf07b96582ca03dd3bf0b3532e039 SHA512 b2a44c02cc3a8c0d4fef3ae1f9bbc121a6f4a25607c47c0b45625b272a754ce645443a95b074f89319877221e8b74bd0101c5a0ec741d80b7ea37f193dc1af42
 EBUILD awl-0.59.ebuild 667 BLAKE2B 8a2ee9172261d663e458c212a6a25ce5211f3a98bcb2d55f8141111a33a29f2d6a465f660bc87fbc345827e0a00fd7a587009b55c4d5586040fe2989b6874ac3 SHA512 f2a75a0c4bed202f83e54ff1b19dea5b6c022ed18ba88d97340d5edbe0111aec6c8195498f965270648647d0df47338e68c5f7e16a00926319991b840f765750
 EBUILD awl-0.60.ebuild 668 BLAKE2B a98565e479487e42120e291b259bde5dc4e1d400e4507be90c333071be50d921c702beb69ad36c92d24c6c11de1d96d41a93b1d35c216ced93c3cd68b97c10bc SHA512 c8d4b18179bc08a2e90e1538d58330f71f88edccde18ee3756a7d133b607e65d9cea8344f4610cda3660dc3739dd4981414f38eaf0740f681ceeaaeec47ea7a6
-MISC metadata.xml 476 BLAKE2B a082768fe63887996c15e2736d62a055692bc4fa0ad815f201bd9301b73dab3b084e10915e65d5443ffbab66d70ab9b42e12b2ccaf18e2f1a909879c3aa6bcc2 SHA512 e8607666ba3713a2484d18bbdd9387fe20705903f6688b0209a32f97d6c3cedb9d02ca8f205c7499aa431cad2b2ba2fb017e7cf2ff8b8970dbe10664d5c0eebb
+MISC metadata.xml 607 BLAKE2B 7dbb1cbff742ad363e2ceba2259f44ca5de4abf9d77b61fc6e67b427b9c065589f0bbdb9ef0c2a998c0fa5d2dceccc37b9f9f07b9abea983e961ca9c32e3860d SHA512 329e26d79c646dee99fb39942b7f3e4c754fbee5b747d1575537c5b177ac6d0cbc6711a468630d6f15d0b31fd531c75b1b7237dbb54249ffff3ac8b63a53dc84
diff --git a/dev-php/awl/metadata.xml b/dev-php/awl/metadata.xml
index ce3237c0bb82..08c762631e2e 100644
--- a/dev-php/awl/metadata.xml
+++ b/dev-php/awl/metadata.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>till2.schaefer@uni-dortmund.de</email>
-		<name>Till Schäfer</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>till2.schaefer@uni-dortmund.de</email>
+    <name>Till Schäfer</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-php/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest
index 663b51e55444..66d6bed89b25 100644
--- a/dev-php/maxmind-db-reader/Manifest
+++ b/dev-php/maxmind-db-reader/Manifest
@@ -1,3 +1,3 @@
 DIST MaxMind-DB-Reader-php-1.4.1.tar.gz 19667 BLAKE2B b397eb1bb7fa00c3382c7ee7c019c401d390c88d9bccd7742873445e95cb87d780ac17affe5cd1ec98e6f60d16660784dc5fdb188f8e4d2956df816397a9c251 SHA512 2407f3d1af10830078c9f5ba93ee74761084b06e630242eff0f707b98bdb78e6e87dabc999c36b29780ba9c8c38aec0225700005b66d95b3707bdc06875c6dd5
 EBUILD maxmind-db-reader-1.4.1.ebuild 2210 BLAKE2B 6784fa6b01c81d2b5a7b2dd6d7104fc78d662982ac80518241790b958850c6b086763e8422ec5d0c0d83a4b8f8390844d09840b190b1cede3e2d691b9af38c41 SHA512 972ff928e787addbbdfdcd39fe140b2ef808502633a48ce9937eca091e05123b5139b3fb9a95f9c4d6c3d1f48f5eeb099dffb36e169f2c4ee36deacb886d2a2d
-MISC metadata.xml 472 BLAKE2B eafb00cbc65f3b5363ee77c111deaab80e04072ff4669de2ee80a669b1c81f72e8dfb567de682c4b2b5597d731f1bd4480a73e0b9f3b1ee32e02b1f72ced1180 SHA512 7522517bc559e5309dce0bfa525c80f0d00ca57f03d7a6c771fc1ac20281c09efb142bfdafd56633edfa3e2a878943d6bd3c16ea3f93f0b5ca8ba11a5f28cf8d
+MISC metadata.xml 585 BLAKE2B 0b6a50c15e2fe822a2a3cb52b7fec01677d4fd8601f9b3d0fbdaffedb951edda038d721bf4fb10ed49c3e87823115069be53495630ed2472c982084256c9d1eb SHA512 ec754283b76dde98c10ae1bbd0c11e24e53162d4829e3d32ca9c32b9dbfdef4df0494ba2fccdc0ba1c05c9aa58086c5064124daff69db00372915c530089b2e9
diff --git a/dev-php/maxmind-db-reader/metadata.xml b/dev-php/maxmind-db-reader/metadata.xml
index c6051cdbefb0..5e6d2f4ffe63 100644
--- a/dev-php/maxmind-db-reader/metadata.xml
+++ b/dev-php/maxmind-db-reader/metadata.xml
@@ -5,6 +5,10 @@
     <email>php-bugs@gentoo.org</email>
     <name>PHP</name>
   </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
    <use>
     <flag name="extension">
       Build the C extension that uses <pkg>dev-libs/libmaxminddb</pkg>
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index 78ca3c15439e..363f68c1a412 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,3 +1,3 @@
 DIST imagick-3.4.4.tgz 253434 BLAKE2B 73ce21547881b60733dbc19ae83cd2e60135dbb4052ea723f1ee10b3759ce12065a0cab2a7e4923b78e9e68b12fd7b875c7d1bd7b2a14ce4e4d7ff5b9c7fbc06 SHA512 73145a1f095849c32760db2dfc4acc13c57d99a037d65eca9b0ddf8f8e81cf6d28a50f2614e44bae1d90b4f881a2e9a64926e0e3b9403e491fd903ffeb30c4b7
 EBUILD pecl-imagick-3.4.4.ebuild 745 BLAKE2B 7e753b3f1fd62a106d3823520a9e7e410686d410330af657895f64edfd94dd5d9ca82b51a0fae73da4e4d888b89a5aa2070200a9bf924aac67ece5cfa0235698 SHA512 fa8ee43dd4de12df29909b182f6e8d480399fecabcbb242dbf52e74e35cf02320afb41827cdd2e3a2412e18810f2a3b13ec659141dbb98f0e1da5c8070d4adb6
-MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
+MISC metadata.xml 358 BLAKE2B 0bfd697c80f3c64bff567b59cba40da1879b944b0775ed1d5e7fb4d80b057403dce613ffec5d5f06b46b7446dc16b3c95523f4b230b7f68ba3f6e05e502f9753 SHA512 c0a0fb9ceafd2378e774675500f9c1c60a7510a30c98f293bd5c92f83bfbe6a10b59d0b85ac6de1724b9e5deb1a7c0371e35871a8c7b9c63724df2762f3ca7a2
diff --git a/dev-php/pecl-imagick/metadata.xml b/dev-php/pecl-imagick/metadata.xml
index b86acf66c756..16ca6ff90970 100644
--- a/dev-php/pecl-imagick/metadata.xml
+++ b/dev-php/pecl-imagick/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest
index 3d3fb0853226..e4285a30f21f 100644
--- a/dev-php/pecl-uploadprogress/Manifest
+++ b/dev-php/pecl-uploadprogress/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.3.1-php7.patch 4948 BLAKE2B 12ee139944a17989429e696e7457a3926d18f4300bf5bc2f9bfab2a036be88a47ea03ca64f06e378bb2811fdaba390e29a905eae87362c4a979c17407de53f3c SHA512 5b913ac4c006cee917ddb7140dd2e34dee6da9fac11001e6ee9f41ac0b65e3caa493c81612b05ef8ff99fec9c9a4cd4a2c2c275fc6124223d04648d43cae4fe4
 DIST uploadprogress-1.0.3.1.tgz 9040 BLAKE2B b926ee0cc7d40276425ea8eed86c5934c35ff2436b5785888394927a145620caa335d4eae87fd85bd754f8a67c1562f3b8d23a2c626f0d0ca4bed4bf4872e465 SHA512 c317a30ed81430184b643e2755867cdccf9848312aa31a5527e4fe229ac19ee3099121de8e253207b55dd7e788c28720bd3c477663c4ca15100478647a6dc1bb
 EBUILD pecl-uploadprogress-1.0.3.1-r4.ebuild 676 BLAKE2B f8e74b00e3aa1b6358b9cb390e828b584dc15cd6fadf46700811f52be62629b5647d74a29b968cddc24ad61b741f294cbfd7c942083c7e7c6ebe3b6826be74a5 SHA512 a2989c7597e2a522dc3f2e813c383f3bd9f59a8a9a0baed0baabc422b6d53fc53fe17e1c41228daf812e4546666a59a08183e823b25f915049d89fb16cf8c75c
-MISC metadata.xml 526 BLAKE2B 719015d4f11e9af4765f71ca1b8706fdf93c214ac7390f72579068151adebe0c39a29019201323aff6668ca2c7b31daeab247a867262138358a29034238a875a SHA512 18d72c569825f9dfd79a69d4ad1bc824f99001f2b1545aaaf6777a67050d9812dd81737c9e74bc9520aa5b375db4d94c5219f359eeaa5c8d7ae0a6437c96ec56
+MISC metadata.xml 667 BLAKE2B d007dcf3d963b7994a461dc554075eeaa013628b194ae355dfc39fe44ef892d28597673a472de482608501a05183838e428e2794b4d7d4069c8b50aaa2ed81c4 SHA512 a6a5cfc834367a2f9ed9fcff1830212e527572af9bdac0a41d52434b4085a5d848e3a9b9d7c8473492c13addf2560a54f4b6cf57d4f5ac14a482391f33987dfa
diff --git a/dev-php/pecl-uploadprogress/metadata.xml b/dev-php/pecl-uploadprogress/metadata.xml
index 5f21917bcc4e..ce710ecbb07d 100644
--- a/dev-php/pecl-uploadprogress/metadata.xml
+++ b/dev-php/pecl-uploadprogress/metadata.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>php-bugs@gentoo.org</email>
-	<name>PHP</name>
-</maintainer>
-<longdescription lang="en">An extension to track progress of a file upload.
-See http://cvs.php.net/viewvc.cgi/pecl/uploadprogress/examples/ for a little example.  It is only known to work on Apache with mod_php, other SAPI implementations unfortunately still have issues.
+  <maintainer type="project">
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+  <longdescription lang="en">
+    An extension to track the progress of a file upload. See
+    http://svn.php.net/viewvc/pecl/uploadprogress/trunk/examples/ for
+    an example. It is only known to work on apache with mod_php; other
+    SAPI implementations unfortunately still have issues.
 </longdescription>
 </pkgmetadata>
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index 5132efa3c185..1b594d0d8053 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -1,4 +1,4 @@
 DIST manual-en.3.1.14.zip 408414 BLAKE2B 03d4e7a386eb3bd5b19e5c555ec34b86812838a5b5fac8ec0ab9701fba89a5867714da57d950f68224a89bbe2267c18d638ee850681860de309c74bbfb3d0a0b SHA512 d384e3856b45ed3f992f3732a5465120abe9fb947cdf13ff67a9c4264f72987d24885ee61cd7309b728e64cdfe4f34c3e7f757096d35de56d962f3b78def9e58
 DIST smarty-3.1.33.tar.gz 249999 BLAKE2B 1e174b190238c8b20d5dae9c0c9fdf264c4716ba850599a2a028fe6c307eb3d9d2611e3b928efb9471e051496e4e31502458cd7a71a9318e012d5af7eca2c50e SHA512 443473cf12c7e053744daef7a70d4172979d760278aa1593216d0b70f0c12ca2b48eb79486a1c10a1cf2264da671804b94ee9d538b9013ff0bdc42e28639ca5d
 EBUILD smarty-3.1.33.ebuild 1330 BLAKE2B fe6a2bc48bec01af1c5f39023da1e56bfc68846730481d111b068fe729d444a78c8e3af881bd08ada0e9c52b2b75219747f2d4efbaec3ff13b3ac4c2928bfcec SHA512 d1410ba3dbeccf10015fa94ad39098a5bd4e90506d3f340ff6f50c3b64f90a548582c7e3c2251639a91bb85add57fc66ee6e71d3e8eef8133ae07e097d7ee56b
-MISC metadata.xml 581 BLAKE2B c8e02efefe221a4cea961b32c448d3a69f2dbec795a1a012c727777dfc4a448fd0bb23816564843f0a3fe6eb67453175ee84417e7ffe0e72aa48f8f131b72aaa SHA512 1bf0fea8d62a06b1b67ee417eeb44dbb476ba590b35808f7c7bc1b40a6758b2c3f931e8290c2908a14828f8e2789eb8e2c6d5a26e106f97359f45a476fd31401
+MISC metadata.xml 716 BLAKE2B 8abe288ed9a4ebaf525d4fe9bf2db14a9b345570298a4f024a034802326e5f87b99530380638eb06697a18e2aea2b605bac197bf2325d15c5f278b2a764b0e11 SHA512 eb97ed210a66eb9e46f228736008d207183f73b48ce5fa4947596935b9200f4444bd54726fa5ec01cd75c8d988e8d357d5d8c56055d3ce3d9f97e797365e8779
diff --git a/dev-php/smarty/metadata.xml b/dev-php/smarty/metadata.xml
index 65adc5d3d3e2..9f16ebd25179 100644
--- a/dev-php/smarty/metadata.xml
+++ b/dev-php/smarty/metadata.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<longdescription lang="en">
-		Smarty is a template engine for PHP, facilitating the separation of
-		presentation (HTML/CSS) from application logic. This implies that PHP
-		code is application logic, and is separated from the presentation.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">smarty-php/smarty</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>php-bugs@gentoo.org</email>
+    <name>PHP</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+  <longdescription lang="en">
+    Smarty is a template engine for PHP, facilitating the separation
+    of presentation (HTML/CSS) from application logic. This implies
+    that PHP code is application logic, and is separated from the
+    presentation.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">smarty-php/smarty</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a20d7ae83c8b..4ea6fce855ad 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pysrt/Manifest b/dev-python/pysrt/Manifest
index 1b26f279e0cb..33bbf63a0799 100644
--- a/dev-python/pysrt/Manifest
+++ b/dev-python/pysrt/Manifest
@@ -1,5 +1,7 @@
 DIST pysrt-1.1.1.tar.gz 104027 BLAKE2B a035234d687a6d7e69123a012087b8d065cad3904ce422b3a4390b0f6a0ad8471e35d7f5d9cd7e835ff2238566dd0b7a40a039b88d5b6d3a4be464e390847d79 SHA512 607f80c1f66702d36b6fa54b293f59c6a28415d812bf54d7210075d1c84a7547ce2776c0809910ed3d79c08a3c595ce74719976d8f2818820a3f4a306ffc1825
+DIST pysrt-1.1.2.tar.gz 104371 BLAKE2B b6f8e1e6d0cc0ae7ac4a5eb1ac9c5444318fd579fd2cbd926bed932326c986743d3efc1b604353df92a3dc67ea0d47f9a77eeba28d561b3f69b4b63eff8b78ad SHA512 a3a0988068d3cc13e6d44aec548a94e79d9ed29cfcd1e8e35ff56b50f0feb32a1baac2220c5331281c98a19ad9a3e9f960832a661699921cde0d185ea21e9753
 EBUILD pysrt-1.1.1-r1.ebuild 804 BLAKE2B 887147b7a0bbbe8c2dcceca3ce08e73f061017c723bd15fd9589ca052812ca89549b4cfd204b12013c91ef8453c7bf29c8ea9fffdfdb24bf9bf59ce37a78468d SHA512 fd9751aef8aa9f91b92a3d9c9b864d2c6027154279bb74906fabc01ac4dd7d35afb9ad605ffbcd68592f46324759969ef7afe1d204788455e2894ba75f8b1dc7
 EBUILD pysrt-1.1.1.ebuild 801 BLAKE2B 4812210faa5043ebd795556be29f7c248c53c1e68f83f02219178d68935d3563c01c40eee4796bac6c383d5efe8e1d022f27ea17bf6920cc24d7036ce809bb6f SHA512 b346f18fe6938271a1171dece6e4ba95ce5cc2870e34b5fcfeaf8e930a655bee1d54d62d3ba3f3166fc10063a2631e01e00a0251fa8b5907356f98619d07a509
-EBUILD pysrt-9999.ebuild 804 BLAKE2B 887147b7a0bbbe8c2dcceca3ce08e73f061017c723bd15fd9589ca052812ca89549b4cfd204b12013c91ef8453c7bf29c8ea9fffdfdb24bf9bf59ce37a78468d SHA512 fd9751aef8aa9f91b92a3d9c9b864d2c6027154279bb74906fabc01ac4dd7d35afb9ad605ffbcd68592f46324759969ef7afe1d204788455e2894ba75f8b1dc7
+EBUILD pysrt-1.1.2.ebuild 798 BLAKE2B 7aa254d637277ef4d4e8ce1b43fa72035181ceaef85b19e02dba2c9b6db1df2588526190b0f8150639132265af4070f3b2766c13bf0d85853ed6b804c7b84271 SHA512 3aad4a15d4c217a7989161ae7f4327ecec8396cc5dbc0dab381c0cf10f9508b5b07f0d2ea65dc6e744a3ede4b247afb2ecf6a5ddf2a5bd49bda1966622890230
+EBUILD pysrt-9999.ebuild 798 BLAKE2B 7aa254d637277ef4d4e8ce1b43fa72035181ceaef85b19e02dba2c9b6db1df2588526190b0f8150639132265af4070f3b2766c13bf0d85853ed6b804c7b84271 SHA512 3aad4a15d4c217a7989161ae7f4327ecec8396cc5dbc0dab381c0cf10f9508b5b07f0d2ea65dc6e744a3ede4b247afb2ecf6a5ddf2a5bd49bda1966622890230
 MISC metadata.xml 425 BLAKE2B 1a1b0e96edd162f5349513bb5bd1a2b740a0764e4983c31ad71186227815c9767b0295d3c1b78fb019eca9fca59c6b119d5f4f571dc127b5f3589709837b8424 SHA512 a483c297944a2ec9b417a4703fd64dfbd34b8a7288f12a00e082dcf9c907c52d8c6f05eab5bbbf444eded62a42db6a9aa5799c35ae7d41d1b9e4e9b5417c2419
diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild
index dfea1772bb7a..766998ae2d3e 100644
--- a/dev-python/pysrt/pysrt-9999.ebuild
+++ b/dev-python/pysrt/pysrt-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -24,7 +25,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 6102c7b3121c..734d3c87c10f 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -5,10 +5,12 @@ DIST pytest-4.6.8.tar.gz 956062 BLAKE2B f28e3226c7dfe4188168cfdf9623c96d0b274a24
 DIST pytest-4.6.9.tar.gz 956816 BLAKE2B 7eaeaa0d47c17836a35d9cdc97663f8ef65253099b21d60a7ffc3655d8bd93c6b4e33045caa6c8ab9bb8b920b93e596ba86d8eac4ab07b3b7a5989b38312f4fc SHA512 ab45a8662aa798a6ae224ad2cd68e043c605e4830c76cb6c6aca3cfccef232c024cbbb6c48c9bae19148099c339abfef3270a2208cc7e5c37a10b34b0aa6ba79
 DIST pytest-5.3.2.tar.gz 995560 BLAKE2B aaea9d89e884a82056eeea3068c70604c73d50c96b8d78c6ee14c67bbe066f0e6d882c1b8f95539a2338d6739e047680d901a9db108b1923fa4d3d03dc3f2115 SHA512 2ab39973848d2d4693edd1dbd7ab2798b574026c9277bddd4a18e57aec65b3d93de201e87f58eb26030183b5c71818e6e56bcc1cda8c50892546cb1c04d6984a
 DIST pytest-5.3.3.tar.gz 990948 BLAKE2B fed1d9386aeec587134ac2057348cf59cf554a0fb3d4ff7251917662eb52e914021d17890adc58fb40f06382e770f0e22c2db8abdd0d27a2005f187daf1eaa7f SHA512 79ac431f6a965d00431d3fa8353c756166d88628acfc254225f495bae9ca5f9e78a0282156a1e523b044a18da5fec9925a1a2aab5fcda3bac39cdaf2dee7be36
+DIST pytest-5.3.4.tar.gz 990897 BLAKE2B dd6f0a277352dd72e6348e89813a7df50aabf9ee134afd69412100b87a7898128ec6b17bf29082c88554b66ba5622b7e0b9a1338d6b740795f33055a9279cfdc SHA512 562966d74d2ff12715ececa46acdd49de67f5e792687d52b3f53589f6dc6105aed09bd4c5098989d70b8a69e6bb4cfb9c0b1ee7e9cfc8e8252e3ba6b4d39e4bc
 EBUILD pytest-3.10.1.ebuild 2439 BLAKE2B 87a014393086daafd595ea8e94f1401ed79628b8c5e0a0715944e087592454f15a56eaebc953f1166178acff243701add12e376953999c55327f4681423ad067 SHA512 7e83d437cec4d3f7e0d834595dd1de605ed152e1f90384163eebd1d09a7648d43d872c623b02433bfc743bef8370973444480a97fb19af786806d5cb3c200ed6
 EBUILD pytest-4.5.0.ebuild 2087 BLAKE2B 5885f2b8e0b1d7954c0bf7682cd8ee8dd94d09a3d1b6f151ebb543a0ac17b84b9822d3497f7c89699011f250221ab440b5de73049c80974ef4332550f091dc9d SHA512 b4cea619b2f9ceaeb5b3411aff6d8d802ab831ac7c56fe5f244938043b514af84820fb0589800d971caa8674efb5460a98d0963259e45b4007cc715e813d3bc8
 EBUILD pytest-4.6.8.ebuild 2272 BLAKE2B 82dad69a74cdbcfc4ba788c69c7718608aab9e81eee8b0f35bede097597274ca5ab3280f450d6c71aadf8837fc4d0978e8cca2df83ff372e121acdb78000f8ea SHA512 a4664b2de0c77a2ac0046684cf77646ed6638d6faa07742e3662fb0273b9bee40a25dc50b82089ff97745efb8064c927eae4a7b609ec0107f6293efa7275d365
 EBUILD pytest-4.6.9.ebuild 2272 BLAKE2B 82dad69a74cdbcfc4ba788c69c7718608aab9e81eee8b0f35bede097597274ca5ab3280f450d6c71aadf8837fc4d0978e8cca2df83ff372e121acdb78000f8ea SHA512 a4664b2de0c77a2ac0046684cf77646ed6638d6faa07742e3662fb0273b9bee40a25dc50b82089ff97745efb8064c927eae4a7b609ec0107f6293efa7275d365
 EBUILD pytest-5.3.2.ebuild 1793 BLAKE2B 393b1a8d230062d04091436d55d5819f7f038bbc6eed96935109e7f6a42ce3e964e2b7069694ef48c7340c195af7d7258c554e8ce39b247bd8cdb0eb82266400 SHA512 78c659615a398d6e7a98408f2785f161b9f841f277050e952e96aba0817e82fddf456e1ca4da9d74f4c37d193733d05c0ff11d2f16fcaecbb383a62818239c5e
 EBUILD pytest-5.3.3.ebuild 1779 BLAKE2B b037143c812281a7e0d3bbead01e6d281580497830eab33d88eba888172be6f41d1845751daaf251026527bedeee1d1eb6bc1016135898b506d615db2464fa59 SHA512 d18e1f22ec79987883035e843ab601e6633dc614d02d0681b4da4cd6601528fec12782a3eae9ad9e5bee91017ac6fe45f789ab3496a7b362b52e8dfd49c0e77b
+EBUILD pytest-5.3.4.ebuild 1779 BLAKE2B b037143c812281a7e0d3bbead01e6d281580497830eab33d88eba888172be6f41d1845751daaf251026527bedeee1d1eb6bc1016135898b506d615db2464fa59 SHA512 d18e1f22ec79987883035e843ab601e6633dc614d02d0681b4da4cd6601528fec12782a3eae9ad9e5bee91017ac6fe45f789ab3496a7b362b52e8dfd49c0e77b
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/python-linux-procfs/Manifest b/dev-python/python-linux-procfs/Manifest
index 7b6eae7d9a39..3d682484a37f 100644
--- a/dev-python/python-linux-procfs/Manifest
+++ b/dev-python/python-linux-procfs/Manifest
@@ -1,4 +1,6 @@
 DIST python-linux-procfs-0.4.6.tar.xz 52640 BLAKE2B 99da58f6b4e127b24acce2cb37b86c7e8aba4d85c8911be96dc54bf18499b6783af5434e93e85a82ccabe7903ae8884e41b7f74a4bad5ab472556bea78c0db25 SHA512 81dc936c76c2b3272dde85148bfa929e13531c43f7aa61da3def7546fd8c2a257b130f8ae100f1d53936d3dfaebb1ef5b52c022d146f3ed7ef00359a24d05b89
+DIST python-linux-procfs-0.6.1.tar.xz 18540 BLAKE2B efda66e0264db15b0c1904b9dca631683d089207abe57d165a25e71f68194c249a22394c997a13a71b0333aa27dbe7ac1b47488f715e22655d0f9217346d7ce7 SHA512 14f7510828d5a3eea1a8267041b604046392dbb8d7980b03b4d10bdefa88a89a5f69acdfea77255ba664c2ef33ce52273490214b3f76d2865e7b1dcc83e8e265
 EBUILD python-linux-procfs-0.4.6.ebuild 501 BLAKE2B 30ad361f2a4e591ccdcaf720d6910abe5d15396632dbfe2bb18f70713d459d233a20a535475f27aa4848b8a15566f9f96285bc59ca938e66052e08636ce01a41 SHA512 76def4b37e30fec7489f643b25f0ac3e1562c698d768406f40377cee0bfcf3bd4298d1225fd920c979612006008b66b9614d0ec57a765504af7344b0d9924c7d
+EBUILD python-linux-procfs-0.6.1.ebuild 597 BLAKE2B 7032d7d437cd0c0342fb41fbc828ce6d239e9f71e5ac393e0e7fb5289f5f202664974065e41c1a0dc3d7b88f9a869204aa5222953047e508947777240972671e SHA512 5b572183a5114bd84ff463eb75e7c1979329c531de7f547b9022d0c06ce29d6183a75b89b41ebf0684ca12d620dc1da3590360bc89c1f9541961d198ca6b0aa4
 EBUILD python-linux-procfs-9999.ebuild 527 BLAKE2B 97617ae00262f5ea3114947f493d8739f74c774ee16ce9872de537abaa3463fdc38c3e5aeed503e37da41151e9c4b52b118aa76d44d2164ab86421e86f693142 SHA512 20b4b00a0a95b76b658c7529a5fe42e2368f42761cd75235efed56f7a10efbbf91768b38a885067661fd77acfd1ab6b780359da8b2c6fe711913c6c3b2b329a2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-python/scapy-python3/Manifest b/dev-python/scapy-python3/Manifest
deleted file mode 100644
index 4c0acdb69443..000000000000
--- a/dev-python/scapy-python3/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scapy-python3-0.23.tar.gz 2196173 BLAKE2B 32a3b48c83a2e2a4262f47307bde02c272106f863bb52e362dc0e1a23ef2095426a7cdfe7ae53bc6ff980ef08277857a3e877777a6222d89a26812fd69b030b1 SHA512 9cb214a46f6f8b90c10afb903600472e389c30840e6e42c876cb035d18fe13f2affb2914263a668e802ac55727e7651e8dcc1c0ed753a92cd234488158a9ff60
-EBUILD scapy-python3-0.23.ebuild 513 BLAKE2B 312cdef5938abf91b27487240c3d8363cdc01eb8f396801c4da75a3dcbee5feca201564d2b3385faaad129772717efc556d51fbd9eb40ef0720cc6786b25b0e6 SHA512 6f27a210a72a47c34a7b24422bd44f31443457fe6055350d1c678582d19844818e8eea6ba67c0f17c497f42d2fbf4494b5c515e9b243c3a76f15c46913b6f24b
-MISC metadata.xml 337 BLAKE2B 1204e18d13e75e84fb042ccc42351c4a9f73df82a47ae54dbff341f71390353ba5fd52265db2a444bd2347162e8947b5df32239874a0802b655c437521bcba4e SHA512 f1db650a75e270880cb99040ed60756d8f72abc487289f2e4eb88fad0b5bb40047eef1f4da5eddcbf3086aa9ac0dcd03a79699507e027865ab4e3d06f12d1d04
diff --git a/dev-python/scapy-python3/metadata.xml b/dev-python/scapy-python3/metadata.xml
deleted file mode 100644
index f0074601b7d9..000000000000
--- a/dev-python/scapy-python3/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>klausman@gentoo.org</email>
-    <name>Tobias Klausmann</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">scapy-python3</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/scapy-python3/scapy-python3-0.23.ebuild b/dev-python/scapy-python3/scapy-python3-0.23.ebuild
deleted file mode 100644
index 63da26d36808..000000000000
--- a/dev-python/scapy-python3/scapy-python3-0.23.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-inherit distutils-r1
-
-DESCRIPTION="Packet crafting/sending/... PCAP processing tool with python3 compatibility"
-HOMEPAGE="https://pypi.org/project/scapy-python3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	!net-analyzer/scapy
-	"
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 3080ee796f54..4b7fb8915165 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,5 +1,7 @@
 DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40189561fa0ea393a8a2515b24da9a2a383aeec35b55bdd2a9954d3d585450d759548358ed91ecfdb9ec03d391b6 SHA512 9939e9e7c4da30b5effb334969cd835c9d0404a136761098203c699570aab02e63fb3f1b4ab680def0bc0906fabe5f0782ab94cf3095ff10ccf9b3c371653cf2
 DIST urllib3-1.25.7.tar.gz 264636 BLAKE2B 32ee47df52e0d164865400ecb5f0b65d3640173b53e1d9cf8f2dbdec46ac34d56ca66991ab719d9fafb8d49440630a3318312a925f11e3c6b8d26cfa72600c4a SHA512 e43c1b7893488b77a38a9fdcfc9760ceea72c53cf176eb8e4d1d9990732c5c1936f85c653a646eaadb3eaf72a99ccdbb5023430b97beca6458b868095005eac2
+DIST urllib3-1.25.8.tar.gz 261077 BLAKE2B 9625c8bce484e3a0ae8b49a776377d5420a496652d75220438f8f9cfbfa96c22a6fbea29380f45f18d8620d14568056dcb3e8b6a08fe711085298d2f6b2ea870 SHA512 6e380d98d9a8b06534abfab4eb67b685a8311a091e31adcefe2b0ffc61d2b728229df067790b20358f2646e9054a546450c3351e4aa618f31d85573ea50ceaa2
 EBUILD urllib3-1.24.2.ebuild 1546 BLAKE2B 39803592372309905dc6371995be59211b4b94e5fafcc655822be8377acb78ea5afc6af7b2324be364e99ad9903c9ea4708cfe7e22071b868aecc7a4a6a8a389 SHA512 0e968b1b8d9f92fa5874b5cad6db3cf921d7f12dff271d45c5a7549584920e56f8b5b87b43cc24a9b51f2765ce0969832c24c0b331a908dbf73d4596fe3ee9ac
 EBUILD urllib3-1.25.7.ebuild 2255 BLAKE2B 84acdca971d5a9fc383322ae91f2883655b7de7a24c2e3bfc60637f9ff92dddda45a63ec72fa3d3736b678639ced3761964b5c5ca7d6f0b333c045489d235e4c SHA512 f998e4723410b7516dee1e64805146a20c3ef2a5b9dcdf5d0556b529af04b13535694205ecf3ceb1c6d1086ad27a52810980c5f7322cc57c6248c710e0b77761
+EBUILD urllib3-1.25.8.ebuild 2255 BLAKE2B 84acdca971d5a9fc383322ae91f2883655b7de7a24c2e3bfc60637f9ff92dddda45a63ec72fa3d3736b678639ced3761964b5c5ca7d6f0b333c045489d235e4c SHA512 f998e4723410b7516dee1e64805146a20c3ef2a5b9dcdf5d0556b529af04b13535694205ecf3ceb1c6d1086ad27a52810980c5f7322cc57c6248c710e0b77761
 MISC metadata.xml 462 BLAKE2B fa1a23ff540c36b4d00a665f92e4fbc3651ef0d91669c3181b01c6caa3c0c2824ae5ad498c784e13b2b6bbd1763a6eda891385ac584c8657843d61eed03ee952 SHA512 b82fc435e84e67e5536dde9edcd40644706eec6198a65233db5e43f20027ecf70a827f33f7d6b34095151ec7d33b6935bd16022355ac2ba87657185d35210aa0
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 074b8367c1e8..267005a6df7e 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,7 +1,9 @@
 DIST zipp-0.5.2.tar.gz 10875 BLAKE2B 97e56b8e1cbff2344ee6b385085e6c821d61bd2c2510ac54e50a3f706515f1e22789168c97599787787b47f09dabe55abb594f5724d1d540f62d8d68fc32e36f SHA512 8c84b620844315ab1f1aa3c5bb29dcdf1271a0139198b5c3d6aa31ecb9a86f0dcef963819403d971ae0461c737312c064572c57ecf32d73dc973a5f69cf0375c
 DIST zipp-0.6.0.tar.gz 10778 BLAKE2B 165ae85f51fe0c0232f6cf2dde70e2d7f8064413c15616d15e1ebd65cfe3c345bbd5b1b9713fa1171cad18015b605862509790bedd734edf5a7d8c80c5378af3 SHA512 18bef5aa3388ab3901bf08888127fc9cc17d8972a52f23ccf9a8035f09ee5598e17ddff833a10b81b2118461e0c517e88413518736763425a728cd0b19cc2052
 DIST zipp-1.0.0.tar.gz 10821 BLAKE2B f5e0476cb0ca01054abc0c56f1a9581a6f537c002791c4a363238555ce9a211fe13114041374c1bfef426544545e3c654e5b0a7e0541c30b775757c43df6d756 SHA512 dbfadfedd30ca4cb31ac4163f367134d96e57405ef00d5f4c19c0af7a141f78487dec29a0ba94975584fcb462d22c8b536bf29c67b7e298368072e897b0e9d82
+DIST zipp-2.0.0.tar.gz 12813 BLAKE2B ace250658e72deae346484ea94762be9bd2a70705f40fa97e4dcb4ed419100c522f737f503878d69ae54a477045feeb0e028ffc7d636720a03c0825875851892 SHA512 5b53233036c9609e92029e103710100e1b18b3ad7d397128f8c910956ece96d0348a87f181196e69bb3e58e38be7fff9628705b68f56fe526129dbb143c8b8c8
 EBUILD zipp-0.5.2.ebuild 1129 BLAKE2B f2c1151f8c9f27601288c5508dc099ed6c90cf668fc0075610dce2fddcbf442010ac9f3388097459cbb91de012d9cc9912496161517aaac3181d630f421f7ed1 SHA512 1dc2b4335d18b1ccdb7282e1dabe8f7d91fd2e817279de6a7669e38dcd9c3398a27f72331f442882a9b4f5c84adc421072d3672a2e7e27fe63bf998065cf66c0
 EBUILD zipp-0.6.0.ebuild 1196 BLAKE2B f4c446a07369d5d45f2b0563f070ed38cbf353bb66ed7453ea0931d9cb6e9fd77499dba623b869076e8b02de164b72a0bd207ec0238215bee77a751c73446427 SHA512 9f6570677e31aaf885bc458d44c8b9f6e2a67066fa5f284e5ed3681ef566d9caaf94064ba31563e1c881196960d47ef8a67da010180150a7a85adfdc14b4ba35
 EBUILD zipp-1.0.0.ebuild 1174 BLAKE2B 205255bae18e580668df8b3846b0afa55b335354539395dfa82fae4280c369b4262dba4b41c473a3f062f2dff7ff320b7684ad9416f8a844ad7469961975509e SHA512 a56049b22f5f50283fe43688f05702b95bfd54de25d2e2fdf5c076e28a4dfa65d057c52ee99a685f39af9ae0ae8e3b3f15173030f8f06e82b42deebee8ccbc72
+EBUILD zipp-2.0.0.ebuild 878 BLAKE2B d2f232c7893ca8f76574eec2edd1315a3a9cfa8c12a60dce72b6240671f4bc1c104c6206f574071af82edeb838ebd766bc65a8d124b9d80d41a55142b51ccd40 SHA512 b035e463df597a52acb0827082124cf030f8d3de6c8453dea007c2345a2fde7463b09024ef472e286928f4a3ac2c98cf7adedf01afb35dac6767eefcf0dec501
 MISC metadata.xml 523 BLAKE2B b2c729977d84466557f0fae273e5463a41fded78780842e4a92899cc79ad8cf2843fe9c397a70f1d7cab8a7ca317a6723b119047323e0be8862b7294afe96b33 SHA512 82b88eb00bb385c47ebf5c5cd560de25e4f865086983fd9a5767b7fb286406dd06273e8a596df31aba57baaf051b7c353f50f445753541de5b15e6a439132381
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 3247938b062d..814f97aaf153 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/commander/Manifest b/dev-ruby/commander/Manifest
index 95f4c15d0da6..b087c5226d3d 100644
--- a/dev-ruby/commander/Manifest
+++ b/dev-ruby/commander/Manifest
@@ -1,3 +1,5 @@
 DIST commander-4.4.7.gem 37376 BLAKE2B 69965f1bf65cdbcf706a8a0106aba05313e9a49808d5c1ac6e938e364e46e940b6d61757046fab9ec00776b1207832f4232242814244f905267fb6ffe8ac3905 SHA512 1a5169448419cec0b04390a42e79c7299c66cf44a0d1d8cd938879970bfd4c72e5741a5f4b2899e60c707e0088b50853ec19eeda9ac66cc6f26a5790294a03fe
+DIST commander-4.5.0.gem 37376 BLAKE2B dd8613872911c45b927c1c658661ad333d7e0e18e12bb7b84c5968a9a0eb6279c2cfde32a499f7ed335e367eb7142881a6b8321afc1f465fb4d151282199ca6e SHA512 400cd151906b296fabce480465123121d01bb211558c111074b51acbbf98a6bd5dddeda6753a964674c9c91e542787929e6a4fe0eeea46f8b218bee0dcd3f78c
 EBUILD commander-4.4.7.ebuild 589 BLAKE2B d4930ac8c5f2376e25be310e08249a8f3ca310f1747adc043e438f3b47af011854ac132f7982ad987b7112ea52d92db0e91f596dc9cc18ca0b0a218a60fcf67f SHA512 9df9704a20133c32d37e4340fb05d6d75f7748ce0f921388ee7195b4e788d7069408e8fbb0d16852d03efc9647aac97cb3ebdd2a8b2ccce9f4157a273a7377eb
+EBUILD commander-4.5.0.ebuild 551 BLAKE2B c01d41e0cbbdecfc8a35e83419a230196bf6997e1154c285a4516ef7b7ca3e31731a618425b56e8a5caf31de311725fef86ba71fe4d467692e91415d84fb493b SHA512 fc1d12ba0fa8d5b1aa64855429dc0b3ec7cf4cf6ad924ddf3925372917ba0faeb46bc8cdf2bcffc28f2f59f7264c2e5b43475faa06c4222b47d6224576d26ee1
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/cri/Manifest b/dev-ruby/cri/Manifest
index 3defb01391e0..aa44b42c594f 100644
--- a/dev-ruby/cri/Manifest
+++ b/dev-ruby/cri/Manifest
@@ -1,7 +1,9 @@
+DIST cri-2.15.10.gem 35328 BLAKE2B fe5618f86300381232f071e552020da6186e1908ded3703e645fc6067080a215cfff8d4f468f522ff801d6608cc7560379db2b18eaefb5509ed0db1eacb9342d SHA512 577ee6ba07f08d46e67420fb2e579647857207a2d88f1782545b28e6f26cd6b93d554c904e00af38d7f87eb0fd476c66552ec6b1469fa268faad1ff5d1ab8f15
 DIST cri-2.15.5.gem 33792 BLAKE2B 90724633a26acce78e8d041df96d91ea6db21c9d96558cb2f14c458880f4e2fc3a99de2242340cd2d8e4a3c1f68eb7dcf3877c67b4ce6dbc590b4dcf3ef4b41c SHA512 7519fb6eb79e3f818eb66be8344ee10ec61e09f81b3d70c4e0fd29736c957d1e760384661d018833015307a83b5155bb5c146bd6ea67fe929ab96d665279d6a9
 DIST cri-2.15.6.gem 33792 BLAKE2B 901bd6a1812b258b2ef26f5dc534f2249f813a00dbffff0a651dcd48dabedd02c49fb101026bd33ede14ab730d253decee8dc6e4e915fce1c5b1b28f153b281a SHA512 3d997c90c46b4d787f2411e5c2eea5aadc4eb6837948920a93b42e2ecf01637d1589e864b59e60002bfe6ac80fdfa9d0473c0d4b4d94493a998af47f3818014b
 DIST cri-2.15.7.gem 34304 BLAKE2B a472c8ccb01ca4d744343dfc96b08fa16ceb2b2f06abcdc88c19ec7584f54f52cd7d422a56c8d74c38ce6e7a42aaac48433f0a27a6a2a8758c4b85ef0c022749 SHA512 d9567b83f9ac17deffb0e9b1300c69fc827f7568ca6789f06c7933284cd9e620223337fdcfbe1b251207034d7c2cbb003fbfdb1da07cfe8c87a42c962fd91635
 DIST cri-2.15.9.gem 35328 BLAKE2B 9a7cb1337903c153af6d9a4ce7fe5c060ccf476fcd1f68e2beff08abf4169a407103ca67d9f720810092decdb0ac42d1afc8d2a9e0f67160ceda8baf2e658a9e SHA512 a46b78b08f855c4f1062ea213cbecd0a094395c974186fe74f7cd7da9b4a51e81cc9bea350d5a3c13a713c5f57d445f5437e4d1268a7e620036741c7223fab20
+EBUILD cri-2.15.10.ebuild 714 BLAKE2B d849c1bea21623d06b9bada776a6e9e50aac6b4e5b5f0271f519e511ca2ffd9c0b8df70e036a8e5a0ee6d274c1c45146b9503c315621ec7cb49cf0bb5cea4338 SHA512 d1aae3416b0bee45ae61372a553d59364e98c741d3d9928c468795440fbf752f6be618d2c45699e7f643550d371eac62541f6014a74f109aa21e560f18399967
 EBUILD cri-2.15.5.ebuild 714 BLAKE2B 70c18a5b4c4625523ae9cb4320492de7ed67abd6e6c845de61d4adc6cd51ffebc814bc8349d06fa921391cc30105464c39c840e527a42ccf19565707eb9ad87c SHA512 d0a8d3277af331b054533e35166a1aab5ae01342927f07132e65a1634a05be99a737f5190da944dec7268112ac656c25895eaae3b5564cb673ad3ae1124ccebb
 EBUILD cri-2.15.6.ebuild 714 BLAKE2B 70c18a5b4c4625523ae9cb4320492de7ed67abd6e6c845de61d4adc6cd51ffebc814bc8349d06fa921391cc30105464c39c840e527a42ccf19565707eb9ad87c SHA512 d0a8d3277af331b054533e35166a1aab5ae01342927f07132e65a1634a05be99a737f5190da944dec7268112ac656c25895eaae3b5564cb673ad3ae1124ccebb
 EBUILD cri-2.15.7.ebuild 714 BLAKE2B 70c18a5b4c4625523ae9cb4320492de7ed67abd6e6c845de61d4adc6cd51ffebc814bc8349d06fa921391cc30105464c39c840e527a42ccf19565707eb9ad87c SHA512 d0a8d3277af331b054533e35166a1aab5ae01342927f07132e65a1634a05be99a737f5190da944dec7268112ac656c25895eaae3b5564cb673ad3ae1124ccebb
diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest
index 9935fa4589a9..b397a9a6e3fc 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1,5 +1,5 @@
 DIST highline-1.7.8.gem 224768 BLAKE2B 683fa70e3ea4bf697ab5a1cd40da2528e2586f8fe12fb0ffb799938f2bfa2efe64fe1424c0ee1f90ae3df69f86a92f44eebcbb2ab34f18b3c4cdbb143e596067 SHA512 85f57ab732009cc961b824e252f0b65bbe7c0a8c97849d453773a331016b2ea8fa0efe393bc1a0073eae6d3cf523d97b9434cd73bdceed55bc069be0b6f4b41d
 DIST highline-2.0.3.tar.gz 234205 BLAKE2B 4748c3ad8a15e551162ab9f2eb6e176297d833d13e6f5db7898f99c71f25e8a2a01057b0438c5d30b56a66333bbba0da1a435cfa07db97f2ffc5e301157618ef SHA512 f432c8836040bcfb147a84efa2dd3feee7f3f6e03eafbf4232e9457aeef8cb9ca83fcf854d3b261f59a166666abc3f2c8fc0f1279a7efeb07dea8a13be22ebde
 EBUILD highline-1.7.8.ebuild 1291 BLAKE2B 7259fee4f85c02b5585e76f5fb46fe4f1b53283acbe100c990192aa6edd93b785beaf9e5667c911113e2e5f0d6d5811ac1f5777746691c46f25fda4bb45815de SHA512 088b11df5453545299aada72e765ade4db4eae7660e1e949d5caffd4d27ac20e75157be9339e2226f0db217084f61c41b2d80b2154c128f0a12645fceb309568
-EBUILD highline-2.0.3.ebuild 1063 BLAKE2B d03cd3d00cb255ab2c4bce81b98815404f2fb9950b3112851abc381960fa86c8800b7669685f4cb486c7eb39c9a806a632b6f161597a9093948663b3607c154d SHA512 84d575536d2dfbd379c820137ab6bb25b31f3ac781dc425d1edadecb49b9f52349f6417deeec0a35952e574ae90583456cff34ff76fbb651a847d057a266d0ab
+EBUILD highline-2.0.3.ebuild 1070 BLAKE2B 358325c33b2bb4c5ecac17a309ad19fe35198484ca719082fcfcfeec47c81eb6598735c48b28bdaf3fbcb4bc178139f51faa634c0c3274ba612e052af92e45f4 SHA512 baf49a8c3ab88723f45cfacbf6c2f06f4f147220be41b110617c4e68ec0164f549205c78385297c5a69dd33d87093235b3566de718ccdd59d058acc2ec62e93d
 MISC metadata.xml 339 BLAKE2B 58671f84213ed36194c80df5fdac1618917b26161ddf8a8829980f5ce7e7aa242c84d17aaef0be655a36ccdad24d93714ccd6875fc073ab537c2186e33da5e8a SHA512 723488f3e201d857ceffdbc6779199469aea1d3d21a391c5bd5ab9402388e6c32e4964491a609d7065d0684a256811be04f2df20b3db745d83c4cb8bd769a945
diff --git a/dev-ruby/highline/highline-2.0.3.ebuild b/dev-ruby/highline/highline-2.0.3.ebuild
index 36253ba31a83..d1a0c32767f8 100644
--- a/dev-ruby/highline/highline-2.0.3.ebuild
+++ b/dev-ruby/highline/highline-2.0.3.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
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
 
diff --git a/dev-ruby/timecop/Manifest b/dev-ruby/timecop/Manifest
index ab25f89c3cde..ac8504a1d334 100644
--- a/dev-ruby/timecop/Manifest
+++ b/dev-ruby/timecop/Manifest
@@ -1,5 +1,5 @@
 DIST timecop-0.8.1.gem 16384 BLAKE2B ca3aa8422841b83f4631afa102c4475f4df73c3968eb9ec17d2159a41ed976330ac9c078970f3ed2a504146ae0f4d88650892c314c92da6dab0f8a0ff0a24a35 SHA512 c4d281aa04fe94636dc23dc0fa6ea4a1dc27fc1debe550b06a208ceaab1d9d8b160f792bd5f14a7c004cecf489d4427df39873a68fe6ab27fe9c0e94770cc764
 DIST timecop-0.9.1.gem 16896 BLAKE2B f4dd9293743f0be4dc5616aae077965a32e348faa7019867d694689b0376c6be06817870842bdcbf5f398ec4814ae1e4f6546c75c95639bbd2cb8021a1dee3f7 SHA512 2c8429ad4d9c706865810caa80dfb12c16acaaa97ea289fc300e172a359817fea7d31789f4bea75cfae8ce1f84e7d8effd32b39a0482f3d68fb4e225b487e13e
 EBUILD timecop-0.8.1.ebuild 973 BLAKE2B 317082aa3b5e89620e7c4ea141e05ba40b4f140aa2178b49811d3532e7caff4504d9264f529ee94c270ca311b9777f16e10c87e2dab3983a65d9db5332672dee SHA512 872edfc55117ea77e41435cb7492cad6579d7fcc1f67f9bed6828ccb19de2997f9a7f3a8c43a164347f2dda147a5b041fbc283bb84148241fc098d119f347da3
-EBUILD timecop-0.9.1.ebuild 994 BLAKE2B 8b1582b4bb5ffe17b2a5d3bee6da2851b8cbf3bb40dc0797fb70483a62bc25f2faa313b8029145b628b852c5eef173539f7ce6c4015fd80f9f563a1475f40c5b SHA512 365df9f7fe5c22b011f5c6550e6b16daa8fdc46dc360dd2041818f1abe48bca47a007641d8308a353577c8490827ee3d77d6c2cc90f726b200353d80024d2c9c
+EBUILD timecop-0.9.1.ebuild 994 BLAKE2B eec16314908c7c4ac2fef0b05c4d7430b106925ead68293578aa21d4a32576910da11df0307d2ea9958a3d057fee69cfd9b93397de828e38afa4d1b273003ae2 SHA512 57dea1ea3b84518bc5a8db972b780211273286cbd99df488172fad7e74bd7db23b141afdfc4acba2d5f85af45bc91566fe23f25718b8d8704e17c617453abc70
 MISC metadata.xml 343 BLAKE2B 98bc9d7ecd9ac2badbcf92ce7b89b2b4e3798fc284b7dda56b582a0d18f2dfd4dee8b371bbd74e404985e6d370737e5ed746543393408ec60157b8d0b95a7b86 SHA512 1f1d30e9ec8a13854596017fc22a430ad0b34a8d8477804d28906eaa94c294f5cb7e845adff2aa89835681afab48f77b601b5cbff780d00bf0d58959b2ed4fac
diff --git a/dev-ruby/timecop/timecop-0.9.1.ebuild b/dev-ruby/timecop/timecop-0.9.1.ebuild
index 7e28559b5be0..bf5c2bb9fb13 100644
--- a/dev-ruby/timecop/timecop-0.9.1.ebuild
+++ b/dev-ruby/timecop/timecop-0.9.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
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index be645fc3056a..7caac12dd61f 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tkXwin/Manifest b/dev-tcltk/tkXwin/Manifest
deleted file mode 100644
index e57eb7bd8b6b..000000000000
--- a/dev-tcltk/tkXwin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 1.0-Makefile.in.diff 796 BLAKE2B 2b7692fc20e703641fe6cfcecedb405132c7d424722e286894f6575d773b97fcafa8250ed46d87ac4cbcb929209327c6090a2424670a772158342e8ecdbc7760 SHA512 12dfd890912242624ff3801cd92f414525e7ddf74e373e2287529f2d84d90a68dc2ab7dcd69cdd22c7e33d9df2c5499e2db7beed3b74e8167a43ee3b1d814267
-AUX tkXwin-1.0-configure.patch 2262 BLAKE2B d082b1a287fe4e7d0673e5a63ea080b14a20baf4da2b0355964a5aa945709512f58bc21ced8c9a151d86f4126763f2944a69e79db584d5e7c557edf7b8969a72 SHA512 1c2ba4e9ecc0781a47e3523b387ed2bee91bf6f255564bfd9af60ab8faf3a4759d848ae5b6cdc612068fee3582413a8e7f792f04c5126578eea92ef8db01a72d
-DIST tkXwin-1.0.tgz 168650 BLAKE2B 6893140bb318f69f0094c4a157245f4fcebb54181b7f8327e790bfa27126a287353798f09427f00573463d54f66c224b98974f61ff5d6018485aa5128af899c4 SHA512 0313ec6fc81c872019a7e247fcaac899d5d584eb8066e7abf1d1feff7bc741de43a9b8a6212ed6dcd12566e8c995bc658360833c692eea5f1b4b5fc199cf2d6e
-EBUILD tkXwin-1.0-r4.ebuild 988 BLAKE2B cc8ae5fa5a7a5f86280030188fdaec6cc258143a572755ca98c82221bb06e271524bd1d4bfea6dace95c2f84b1c948712d4b462a6c5e1c3953f5619386d51b60 SHA512 a660ca99219d0d26015b625949c0125e969713aaa720c63e0d5f34bc99e449e169df7a96a78cb567500817561305222293c9720a623edcf656a069fe96aaa6de
-MISC metadata.xml 335 BLAKE2B e99619731b3c350b6f6dfae93955d886db4b27c68a439c3f497f707ee3695049f705337583b9ee4d8313744ab6649d2f2e74a13c7726440b394f0159dadc54e1 SHA512 e7f2cfb18a80ce750d413c54bd49c92a6bb32faeafb28bf9175f1434b73ec0fe4e1ab878d40d6a554a7671e02bed3ca89f29a04d6515801af706ed5ca8bbd891
diff --git a/dev-tcltk/tkXwin/files/1.0-Makefile.in.diff b/dev-tcltk/tkXwin/files/1.0-Makefile.in.diff
deleted file mode 100644
index bd10890c719c..000000000000
--- a/dev-tcltk/tkXwin/files/1.0-Makefile.in.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.in.orig	2003-02-01 22:03:34.000000000 -0500
-+++ Makefile.in	2003-02-01 22:04:39.000000000 -0500
-@@ -432,14 +432,14 @@
- 
- 
- install-exec-hook:
--	$(mkinstalldirs) @PKG_TCL@
-+	$(mkinstalldirs) $(DESTDIR)@PKG_TCL@
- 	echo	"package ifneeded tkXwin"				   \
- 		`echo $(VERSION) | awk -F. '{ printf "%s.%s", $$1, $$2 }'` \
--		"[list load $(DESTDIR)$(libdir)/libtkXwin.so]"	   \
--	    > @PKG_TCL@/pkgIndex.tcl
-+		"[list load $(libdir)/libtkXwin.so]"	   \
-+	    > $(DESTDIR)@PKG_TCL@/pkgIndex.tcl
- 	sed -e 's%load .libs/libtkXwin.so%package require tkXwin%' \
- 	    < test.tcl      					   \
--	    > @PKG_TCL@/test.tcl
-+	    > $(DESTDIR)@PKG_TCL@/test.tcl
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dev-tcltk/tkXwin/files/tkXwin-1.0-configure.patch b/dev-tcltk/tkXwin/files/tkXwin-1.0-configure.patch
deleted file mode 100644
index ac2f84b97f21..000000000000
--- a/dev-tcltk/tkXwin/files/tkXwin-1.0-configure.patch
+++ /dev/null
@@ -1,93 +0,0 @@
- configure | 43 +++----------------------------------------
- 1 file changed, 3 insertions(+), 40 deletions(-)
-
-diff --git a/configure b/configure
-index d92a1bf..d8605a0 100755
---- a/configure
-+++ b/configure
-@@ -823,7 +823,6 @@ fi
- 
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
--CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
- echo "configure:829: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-@@ -839,23 +838,6 @@ rm -f conftest*
- 
- fi
- 
--echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
--if test "$ac_test_CFLAGS" = set; then
--  CFLAGS="$ac_save_CFLAGS"
--elif test $ac_cv_prog_cc_g = yes; then
--  if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
--  else
--    CFLAGS="-g"
--  fi
--else
--  if test "$GCC" = yes; then
--    CFLAGS="-O2"
--  else
--    CFLAGS=
--  fi
--fi
--
- # Check whether --enable-static or --disable-static was given.
- if test "${enable_static+set}" = set; then
-   enableval="$enable_static"
-@@ -2078,7 +2060,6 @@ fi
- 
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
--CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
- echo "configure:2084: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-@@ -2094,24 +2075,6 @@ rm -f conftest*
- 
- fi
- 
--echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
--if test "$ac_test_CFLAGS" = set; then
--  CFLAGS="$ac_save_CFLAGS"
--elif test $ac_cv_prog_cc_g = yes; then
--  if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
--  else
--    CFLAGS="-g"
--  fi
--else
--  if test "$GCC" = yes; then
--    CFLAGS="-O2"
--  else
--    CFLAGS=
--  fi
--fi
--
--
- # Find a good install program.  We prefer a C program (faster),
- # so one script is as good as another.  But avoid the broken or
- # incompatible versions:
-@@ -3403,9 +3366,9 @@ fi
- 
- 
- if test "${SHARED_BUILD}" = "1" ; then
--    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}'
-+    CFLAGS+=' ${CFLAGS_WARNING} ${SHLIB_CFLAGS}'
- else
--    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING}'
-+    CFLAGS+=' ${CFLAGS_WARNING}'
- fi
- 
- #--------------------------------------------------------------------
-@@ -3534,7 +3497,7 @@ fi
-     
- 
- 
--PKG_TCL=${TCL_PACKAGE_PATH}/tkXwin
-+PKG_TCL=${libdir}/tkXwin
- 
- 
- 
diff --git a/dev-tcltk/tkXwin/metadata.xml b/dev-tcltk/tkXwin/metadata.xml
deleted file mode 100644
index 7d188a276b89..000000000000
--- a/dev-tcltk/tkXwin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>tcltk@gentoo.org</email>
-		<name>Gentoo Tcltk Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">beepcore-tcl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-tcltk/tkXwin/tkXwin-1.0-r4.ebuild b/dev-tcltk/tkXwin/tkXwin-1.0-r4.ebuild
deleted file mode 100644
index 471945156f57..000000000000
--- a/dev-tcltk/tkXwin/tkXwin-1.0-r4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils multilib toolchain-funcs
-
-DESCRIPTION="Tcl/Tk library to detect idle periods of an X session"
-HOMEPAGE="http://beepcore-tcl.sourceforge.net/"
-SRC_URI="http://beepcore-tcl.sourceforge.net/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="debug static-libs threads"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
-	dev-lang/tk[threads?]
-	x11-libs/libXScrnSaver
-	x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-		"${FILESDIR}"/${PV}-Makefile.in.diff
-		"${FILESDIR}"/${P}-configure.patch
-	)
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	tc-export CC AR RANLIB
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		--with-tk="${EPREFIX}/usr/$(get_libdir)"
-		--enable-gcc
-		--with-x
-		$(use_enable threads)
-		$(use_enable debug symbols)
-	)
-	autotools-utils_src_configure
-}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index ccd13c5d1191..7b4835f1405f 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/hlatex/Manifest b/dev-tex/hlatex/Manifest
index b0f6a6d949a8..0232d1947e87 100644
--- a/dev-tex/hlatex/Manifest
+++ b/dev-tex/hlatex/Manifest
@@ -14,5 +14,5 @@ DIST uhc-shinmun-1.0.tar.gz 4794977 BLAKE2B 84e1e3a872acf6897d34261a676fb810ef58
 DIST uhc-taza-1.0.tar.gz 1338672 BLAKE2B 8c91e9d1c0490c4e63760baa933f6639aa20fd441868d259f21839816e3abbaf6d7e664a0c76d6afb7bca06c86aa2c78e43a6de74273c158d32a2c4368a0e9f3 SHA512 87ae8ff615e76b1a570f14a4d8f29ae3e15a7dccb75c7b80c1e5bb64374c2b749090f9f6a706cfd74c36d39584549cd36bdbd2ede13c50a9c9d5c3b8a44346b8
 DIST uhc-vada-1.0.tar.gz 1225522 BLAKE2B f15ffe19bc9ae2ec83116ab700b12716bea53a8cdc5bb62e5362eff4e17d9feaa2c1decdbf0bc7e2ad1228cd96d95347e415ec91222db44d5d0687143b661b17 SHA512 663ea0a1d3f968dc30387cd7962962969af6c2ade41c6de585f24b116e79ce897539ddb412735bd19a7c1083a69bd975ba198b442ca25ea30d6811ebbb8421ad
 DIST uhc-yetgul-1.0.tar.gz 5198946 BLAKE2B a9795852f0a075b78896f76fe01301104b16b21fd8b44d5545f99c6bbaf038f64a25bd5805ca65b09d627162651814856fb997d933740e19e638e161f597df7d SHA512 e620bfc42eb30d3b3a60964a68071d6ea68a2a6a8f1c9e1d07a3a9c75dcfabb6b26beb5d65ba76c16aaee5f1cd42c87991033d581e49acc67bae923aefaf6ddd
-EBUILD hlatex-1.0.1-r1.ebuild 2496 BLAKE2B aeb797159d47e392e5d674ecc2106391cd200f1b038a413766fcbced439e07723bbd7c536d77593f5089525f778d4e2c5b88bb308764d7542df7e83f8250ca30 SHA512 78cf8bb9e97ce4c2c721f2ca867eed6bef88f95787c7ed38995e2e0f0fb137ba2d5bcd13f5a7b552ef35c73287de18db80ebf5050c5c1f8feae8f6ebc7c027e3
+EBUILD hlatex-1.0.1-r1.ebuild 2499 BLAKE2B f6a2ec126558f1c5e411f0e9c0165f6dacfbff521fab194191e66eb35a249247911d5cc91853be4f4d37aff32b8fe6d61d0cc280922e6964a7b36ce7e3f03bbf SHA512 de60f91a29cc153de8a4e84259e3b14a9b038f2feaf690bb2e97fa2d708e06f6867dd7e8da3d64cfd47d1f06fc8703eb1da6c92aaaa8143133367550ee7f7054
 MISC metadata.xml 336 BLAKE2B b50f21b184d0548ece37497188f8d6cd0dd664ef669c7e64af31accefa53819e1a20dc8a40a7aff7d28546444ce26bd8eeca12acd9d9ea9459d8764a5ace1464 SHA512 e94ba5fcd5ceb62065d4bcc67d0ef1fa9053589073124a55a775324ea9bdab3d8af4aa3ba393f3388674c73fe9b58fd6598b815bc481a1b2caadf1dce11b75a2
diff --git a/dev-tex/hlatex/hlatex-1.0.1-r1.ebuild b/dev-tex/hlatex/hlatex-1.0.1-r1.ebuild
index 7fbfdcb0a254..2777fba17e6a 100644
--- a/dev-tex/hlatex/hlatex-1.0.1-r1.ebuild
+++ b/dev-tex/hlatex/hlatex-1.0.1-r1.ebuild
@@ -81,7 +81,7 @@ src_install() {
 
 		dobin hmakeindex hbibtex
 
-	cd "${S}" die
+	cd "${S}" || die
 		dodoc ChangeLog.ko NEWS* README.en
 
 	cd "${WORKDIR}"/uhc-fonts-1.0 || die
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1f4bc594328d..85d359d9dd72 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 901f582272a0..713710d1ed72 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -17,7 +17,9 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
 DIST cmake-3.16.2.tar.gz 9109837 BLAKE2B a574325eb1f4c59a5745e3fe1def5ac53c36d4ce8dd74e051d8f4fbf41dab1d0134cf04541c1757df178def1eb65bd0536f1db132f5f9ca894870da1daf5901d SHA512 b5e68083713462400b38424bf1dbfe73d37a5fbe211fadac30c576246024a1d40f95fab7044804b7201a1bc2e7fd5b7093257e9534cd35538c8b274dc00f4b76
+DIST cmake-3.16.3.tar.gz 9111826 BLAKE2B 578c070457074a611504c0113b12bdfc8831c7e2cd523dfb038279404712456032646b107ca4d7d8dbff227e4f326ab053d90e3925a22a68a37d5c4e0d818bb2 SHA512 ca9e0a142369735ef6469afb97f4463c981404bd59c7d48c1ef454dd705460a31a5dcffa4949b84b1ac723f5b7e79d67b250126fb42e1f15dab0ac2a17603672
 EBUILD cmake-3.13.5.ebuild 6179 BLAKE2B 30b41df2a9bf9dea4a375693b5e8b3a8e1a925df878ec6a83cd198cc45c565b5da77aadc6ec8bed43799ab876a0ab34f4bcd6e9e20363a056b1f31173c2b17f2 SHA512 753b19e4a2ec07adf6ca1c519bcbea5a56b0447ad118bd9e8f42b317e51ea89a9d59d8870bd0dc7ca24ae54ed63ea5079c3f69249b94340f3f062ab29b029d28
 EBUILD cmake-3.14.6.ebuild 6233 BLAKE2B d54de0ee0da5fe6dca906105d37b55a90f68426b96766500fba7b8d847dbe8a357b8ce1153344e90962cc6938afe7b9d5e21c430fdb04dc9ae92d0270193e811 SHA512 12bc69453d0695734fe7d5266b8c66441aea2eace35f01f0e69c565f33bc518d6176f08220be6d0db9eaf75dd64e26c8221cf648a6c556847c35b659c6a7e4c3
 EBUILD cmake-3.16.2-r1.ebuild 5849 BLAKE2B b6b96efe81e308591e77e943d0414f5f71656aa15e548cc6e7bf7000605b430d9459e69959665c82bb7a8a619ee1e719e68597527b06b6c1cf9841262e24b942 SHA512 295ee591dccc69ca1b0c1909ba9a4e7894f949a7040498a3f60d9564a650bc8e5c53534c14069098ea4a5719a2cf36f23ffb51d12986078f1ce108642c5f9ad8
+EBUILD cmake-3.16.3.ebuild 5849 BLAKE2B 4f7136200883703006f741dd569bceab5a18906e3a20cef4b2e0683135efe1990387ac19811041071bd54099cbeae396352fb6f4234b29e25bfb4a5b840362c8 SHA512 8f4734b1031084454487cf4b75c924bc5b68102860706354c8041c066d87d295120fcb5dbdffcae11f0d229137b155410b3fcbffb64b52c188be831468b6cd46
 MISC metadata.xml 372 BLAKE2B de2835a1f98bccd88e343ab7c058b40df0e9aa4afe938770d67a6e764ac85926b369b6d9ac4851d5deec3954436d3cb8a112b5543ac1debf74205f05641ed2ee SHA512 6c457abaf6c174d6d14b77af47c4fb65b26873cbb7a5a4fbafc558ff4c5c7c6cb0200c0f69e7a492007af4b402baeaf54177f6755c3e6da0ace149eb9bcfe69a
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index cb1138c5ecff..138c428a685c 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -2,5 +2,5 @@ DIST ostree-2018.9.tar.xz 1951732 BLAKE2B c6fba1321fe21bff569fe1dadd1aa649f23059
 DIST ostree-2019.5.tar.xz 1972452 BLAKE2B a8b015118855b8b0097f535ac074aeffc599c3f6f654967043e8e4de339d2a51e85ad1b4b3f3b22e18d39235e6ad9c1973334a2c4fc9b5c694f2ff40d68ae703 SHA512 27150802ed9af16e698ed163f6ad235f0f99a1410df52b4b1e266585fe665880c0b9490bf245b5593cb277007b7229d808be7403dd964c58aded6e567349c912
 EBUILD ostree-2018.9-r1.ebuild 3497 BLAKE2B 72a0acc3dd8dfd73485c64e84c36cb6e1921a2bab5050c1435a29b1c67ab9f0367bd88ebdf96ceae985d556f0ba238ec1718dbb7d5cf1bb14fcfef387ca77bd9 SHA512 2299a796d6a6aa04678bccc5480a28da60e0836e1cd01a006780e9b177cf0b0d8fb7a37ed66fb47b7374f340e6bdaee32e0984782d65e7c32ada20a92418f350
 EBUILD ostree-2018.9.ebuild 3265 BLAKE2B 332d18bc35108add63e9f43137d1239ed0c6c22ad6b077afd324b0c748463ef570f4aa4f490d39421d9f9990c0e6bc24ae6a1fcd35cf917c959b7a63a219c02c SHA512 7d5e9d903576de26aab5b8b4f574939fd78ac9bdfb7203b2b820a7aa6dfb632c2adf434b40dfd6906f2f8749c13f69c1d61c2de0283f2d6ad91bb4ac67cfa288
-EBUILD ostree-2019.5.ebuild 2212 BLAKE2B ca09c63427689ddb6ed9eb732cd367a3e5190153d949d4a2c2729719af0f096c4837c589cd6e14c7754e22268c2947630998097ccba13d389d702f308e8ed1a4 SHA512 26f41728cc7b181a623930d58713c2471d3137b344eb07e0c52cdccc003a5ecbfcb5efc4146fd2a99e3d19cbc831055cf29e62e17b1164aeb35fe3fb3142ac8c
+EBUILD ostree-2019.5.ebuild 2220 BLAKE2B 38b9a5e4181699dfa99f274d29ace6e7e0970a5c5f1f3a2f8e345633e68707ac38830b0023640deb113c79e3dade0d2b24f4b724deef9ddce62926780860db53 SHA512 77751f604a7377404f9eb73ed227ef14f724c775d6420ddab0967c6b8e1f448f57037ed947af6f93813e4e819d1b1458613942b7aa6086e8b64822d6491de6f9
 MISC metadata.xml 1889 BLAKE2B 58b5a7ce03d273da942cc88468ccc1e8758c2f1e3004a0424567f56e5e6fb589f457e50a1edc759e77b9177aa9472441f68911c8cc5ed39c2c4d5b8b56839521 SHA512 697a3f44a7df7b1e7425afedece72693c77821a6c55a3d5bf735a724ccb1a6655dfabd4262b3136b7af0856eeaf8404adb0c203826f0f8422035c6d66ebb11d4
diff --git a/dev-util/ostree/ostree-2019.5.ebuild b/dev-util/ostree/ostree-2019.5.ebuild
index 6c6f7f200276..f8d2fec39755 100644
--- a/dev-util/ostree/ostree-2019.5.ebuild
+++ b/dev-util/ostree/ostree-2019.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ COMMON_DEPEND="
 	ssl? (
 		gnutls? ( net-libs/gnutls )
 		!gnutls? ( dev-libs/openssl:0= ) )
-	sys-fs/fuse:*
+	>=sys-fs/fuse-2.9.2:*
 	sys-libs/zlib
 	libmount? ( sys-apps/util-linux )
 	selinux? ( sys-libs/libselinux )
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 7e4db5d58ae0..f900683acecd 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index ae8bdab6be9f..4fcee1e6900a 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -3,6 +3,8 @@ AUX git-cola-2.10-disable-live-tests.patch 827 BLAKE2B f7778c373b4e7b2c09daeeeab
 AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac
 DIST git-cola-2.11.tar.gz 1179769 BLAKE2B db2926b8137b2bb11cc9698b37156d8b0c8f72068061d7d1598b2e3237e44764c2914923103aaaa704babe26cf7a7c16bbe28a61770d98954f776b8ce955658a SHA512 99b865d7a49dcb041e54811141d242386642b5ed6fc12fa7a03431eb9b905cb88d88c4892dc432dd59e8ae3c85f20cc40f4bfb9b6ff002f4e5a4cfc0bdc4c72c
 DIST git-cola-3.2.tar.gz 1208723 BLAKE2B e0375502c7b760a35217c48708e34ba061934f968e6720c3560603b5a76c9474a3a8426f2120ee853a9ac475fc9cbc33ee6ee9a946336e1f28a89d541785c535 SHA512 ca171549dad692088e337efad6f480103a41a1a94f57ae66c15fab3d69e3b18ecc28ac1178886fedd6d969f783e8d5feb4922539c1739ce52c0c0ac59dc941ee
+DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
 EBUILD git-cola-2.11.ebuild 2363 BLAKE2B 01ab123c26e500b8643472fc2c7461bd1e5c9430dcd4cdeca87d894f1470c972997b4cecffb71fdfcc1dd5acdc924ec18adfb8952001998327c245cb669ab46c SHA512 e685d1a9e78c4e884ec07262a9135fb19971b2fcd5cae3c67f90360dd54dea001ba3fa7ac471930ca691b03051a3c767a825249eb2e34cb40d3bc2cd56b10fd2
 EBUILD git-cola-3.2.ebuild 2248 BLAKE2B 7e6fabffd82dc9410acda407dcea904ef7d1d790b124dde760dca6b1b236a374a13340e1efc16cf1c667063174d7ca85261a53f174c0456edac0c932bd32476f SHA512 f757277d68f3187481384ec4e95323e1553e46de38ba7a4ef196f4c5c93d66353d2b93e8ee82dcbf3019e02b74eb68b2fee34cc3e6e02ab7697448432304aec2
+EBUILD git-cola-3.5.ebuild 2344 BLAKE2B 7b060cfc0e0aecc104a261fcfa84faaf28ab508a466f710f540784f0866e1b2ffcb8f513e73080b77af3a7a4f008cb38fd7c4d0902860b037b4cde18401bc966 SHA512 0d12db48bf1d9a3ba3949eab203df2e22fea1f9dd1de53a1e36745203ba14565995b7753f876a87868edede8c6e5bd99c364b66604d03d548a4f117b5d83b86b
 MISC metadata.xml 254 BLAKE2B 0ae656bc7a829c95367497cfe1198346a0586bc944809725fc83ff0b92d33ddadb0a82407300d1467cb4ea75073d2ab0a89b8d67d8efcff400a444b06330c77c SHA512 8a5fe25f733f77a4e70a64521dfffbeeb8539dc709f55dd9a941cc920f7a7e6a8918cb5f07d7b57ee5ad63abdaf31067a217afd081164e68562239b584416109
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 71f66d133dc3..a82bc2084268 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/xboard/Manifest b/games-board/xboard/Manifest
index ee1d24083109..865a6b57f2f6 100644
--- a/games-board/xboard/Manifest
+++ b/games-board/xboard/Manifest
@@ -1,5 +1,6 @@
 AUX xboard-4.8.0-gettext.patch 502 BLAKE2B 9c763076afb8ef182e715cbe82a7935ca495d9485326807146fcbe8406c56cfaacb9ebc0221b18628ca36379cf8d8d14f5fe0c4d0577487e39abf8305e9fa6da SHA512 1e2e68d972e7fcc299940be72bf3f486cf132fc247ed9f95585379108a35cdbe00824108ec7ca679e37c612357ca5b03fe6bbc8d1082bf8d40a809e021c4c0a9
 AUX xboard-4.8.0-gnuchess-default.patch 1441 BLAKE2B 2b37c3650d45fb46bdf57b93152d99de3a88c1f75db33d0f4ecc1b2105cfdb444599af8905955b3a5a91527bac770fc67e0ee480d46a9c81b73fc1c11bf3ec68 SHA512 3ba68ce96dbdca3f0f8027d54c8cf7d8b7f278a2eb8bf549e3f9a2979bfb19aa0232d391430e6725bfdc73befdcc2da221663ff974774ab81bfe052286205956
+AUX xboard-4.9.1-gcc-10.patch 951 BLAKE2B 223ddeed108ad686ff600186f094b68bb3e7e2fc3d72ce3ab3fc1d7c217e1a9b9c9f8e4b5e347a68d8d55ae8e2c7ddccee70c7f7a3ef93da84eb671403928e92 SHA512 ea4c03b70136c587c4d010443297acec84c7a7a274f3ac5c0b15f4f1077c8bf6b9f58e4dde7ff7154f222bdb8c0674d240bb234df252d70edf2726f3dbd70bd9
 DIST xboard-4.9.1.tar.gz 4015017 BLAKE2B c886cb06d9b4ed394220f133915a55e1dbe29d317891d00d880c597abe0ad43a8377c926d844318b0092120aee7e40fe8c6c62fff41890c35bd768575ccef731 SHA512 7c6f17450edc3f56d5987f6363da01633850b87b0d6664524a4697216dc66aa58f84314ba57ee68aebfbb01ef96995e34be4e98fb4a5124e3f5090690f91ae08
-EBUILD xboard-4.9.1.ebuild 1818 BLAKE2B d6a5f9edd420adbb49339427e0f71bb1374eb281e004de795ec7d44d9d2f3ebcf3f418d41d2cf61eba2cfb0ff73568e47a9e1956ed710e86407aebb027877e1f SHA512 f45fc03a95c1cb75cfe4ab7ecf11997506a1ad182e1280286c49a8c4bccbbe33b4d3d05b12510c4d42818e88f06c52be0b63907e82fd9083013eb8c9b476a884
+EBUILD xboard-4.9.1.ebuild 1858 BLAKE2B 275ad4f531b500391a47b53d72d05698931e2ac5a093a5dd19651f81c8043ce85b39239292a5451c90843246e3e0868f88625a1860157886c1520c833c73d1c2 SHA512 f191448192eaeef69fb2274bc0dc41170b86d9410d5eec629b33e25b1a84a8a1986f2f910797734514844d6af95090c7e7c8148fefd2c9f4e7e87e330cb1c2a3
 MISC metadata.xml 418 BLAKE2B 0fb5a3b7607b0c609e7bf50224e1a53abc1e9dd90a811e964bbc5038f96966d32d4cfca6b8eaefc7e64be3fb2302a0231162554cd436043471c578830f74e1ec SHA512 ff385f8c46788e3c76fcdd891f4a4be50b100ff47298eece8a2f1ac3dd166ab384961f3fde0967dc3b3afcc3978cefb5025e4eb0dc69177395c75affa2416d1f
diff --git a/games-board/xboard/xboard-4.9.1.ebuild b/games-board/xboard/xboard-4.9.1.ebuild
index a2e47ab04728..96d734dff452 100644
--- a/games-board/xboard/xboard-4.9.1.ebuild
+++ b/games-board/xboard/xboard-4.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.0-gettext.patch
 	"${FILESDIR}"/${PN}-4.8.0-gnuchess-default.patch
+	"${FILESDIR}"/${PN}-4.9.1-gcc-10.patch
 )
 
 DOCS=( AUTHORS COPYRIGHT ChangeLog FAQ.html NEWS README TODO ics-parsing.txt )
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 5278d6f7676d..296dbf30559f 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 8a9aa5ac77be..3e34098a9376 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index e80f91a5d352..74f0fb8165a3 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -5,5 +5,5 @@ DIST gnofract4d-3.14.tar.gz 862499 BLAKE2B dcca058b6a625b4d2f0153f896ed029b27b8e
 DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5
 EBUILD gnofract4d-3.14-r1.ebuild 838 BLAKE2B faf89e7b8110f981fc500a83b10985e71bd60320a3ae1ff4048d9ecef5866399369e13c35904df5d0474afceab7e29c16d69322aac55bf0a7b12500ca97fc6f5 SHA512 639bbddf911d9314e99142e4f55ab968b0898293d8ddeabd286010faa9304a35cb280f39790028360b78e64c8722581239913b37e15e196631a5011b9fb6950a
 EBUILD gnofract4d-3.14.1.ebuild 1142 BLAKE2B b6ff0697afc901a6e4ce549f2c5a6012a191ccec2b36c26e9ca428e753f422e9759a87b3dad612d715f2f4647eb46a63c2ebf6855c077765c8f4f88b7f00ef06 SHA512 63e621da4294d0b18023ff8f6df66d657ca1fff0af0156d226f19ceaa675f75640798b0c5dca34ce9da19769fe355dbe5268b6fc61bbde26236e7b651bfc9ad5
-EBUILD gnofract4d-4.0.1_p1.ebuild 1594 BLAKE2B 58cb658e2ac1c385f8911be5ed2013bda5cd350f7a722a9b08a7ea1822e68c38fb62f356e6c97dc9898bda17f3ed59a436ea0b14b5ba5581c1c68e8ba583d9a2 SHA512 afe8f5ea63a47fd5405d58215c1785f78a18ef51b5de2fd6bd6fc24c2901e6ff918872b6341f7b95f10cbba042345ba33aec82ac7045293023da3f1568cb4d32
+EBUILD gnofract4d-4.0.1_p1.ebuild 1587 BLAKE2B a5bf8c0e09fcfad146b17e8b9539ac71b1f3cf6a99b9e3fbcf63990851b3c74f94debce896f5402031cd1c07f513143bcf1be49c203ffd087c1c88ebe9db05a2 SHA512 dbb31b3576f377bd6a8dc6668c5db387e9fe78249ffbfd4e84d6b2a6111f77598787aa5d2d3a12c69a45bdf9b98680a19dfe771f6223f48b48665e159665dce3
 MISC metadata.xml 403 BLAKE2B f0bfac9f73e6c64e4535ff9dd389bd65bd622ba3aa0b64d52ef1f3b96a5cf0fbc4913c311b3e227fd9ac91c18f3d78aa9ae085c7610b06e768a39f6f5993121e SHA512 ed69568f628be6a938f2f2cd9a7a2610b881f437ec57eb12baf803b00ddb5f62e7d562a1743eaff5a3fc8d083802cac05ed965aa0d473846e94aa526e66babb4
diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
index b87c0d129ea5..e42cdfbabe28 100644
--- a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
@@ -46,7 +46,7 @@ src_prepare() {
 }
 
 python_test() {
-	virtx pytest fract4d fract4dgui test.py || die
+	virtx pytest fract4d fract4dgui test.py
 }
 
 python_compile_all() {
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 48e605bde741..62541cc3f8fc 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 0bdc95230949..d9337857e4d1 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -9,5 +9,5 @@ EBUILD alsa-lib-1.1.2.ebuild 2123 BLAKE2B 97a24d65932fdd5d1a08a94d77e1a456cdc205
 EBUILD alsa-lib-1.1.8.ebuild 2068 BLAKE2B a8953eb38342fae539132e3bf1f1024f39762c922a223895a8a11d6f741d414ff0bdaad84d54f4b9024ae2f70c33867f177c860e9d2d438236444b64c1510785 SHA512 aa228c80a34c2ff8fce3cc2bdfcf254761325c93b6beda262c90754759871eb0ff6a70ce98121e4505b3ec2941edc3615201e442f2c48103413da0c092af1f5a
 EBUILD alsa-lib-1.1.9.ebuild 2076 BLAKE2B a5b993db209ad0fc59d2846c083a0906622a86911fcaa023fdb90de823d95ec33f67b61d710ec5e164e78ad323c774bc524f844f7dbcd3b8e5f0b102b30192b0 SHA512 a13d43dc7efb41f4a47ce06a66e07b8f7846350988fbfd64c01ce9b6c14da35b24a8b02f59383ba339230bb8efaf938c09a8c225e923c00cd207cbc47b646aef
 EBUILD alsa-lib-1.2.1.1-r1.ebuild 2147 BLAKE2B d2bb59384252242313a6bc20197bad9dd8979bf0bec59ea8409793b4516b169caf3279ab88c941404580267dabf604071ac8893889097c63403be2d11c329b12 SHA512 abab7f9e9c1b896afb1f7236f349315acbe71ca32316488148c5ee47e35b0ed67007c2cc645adb89f0fa94f3c297f344ddf962744cdb4071a840b781fba1505f
-EBUILD alsa-lib-1.2.1.2.ebuild 2090 BLAKE2B 2e8e9197cd7ce6c1aea8601d14ebf4ee1076bb858c0f51bdd54dd072b224e32fa7169a8240590396a15c0014d795f1705300de1e335eb101493f300d3856baa3 SHA512 76b3f0e214242adf92a56f893e7a1e399da286372266268716e508855503d51b0800693d4330f24420fb74b8833f5a76a7c7f403d951b6d7c61f75f780e0ea39
+EBUILD alsa-lib-1.2.1.2.ebuild 2089 BLAKE2B 03670c8a14a87529d01f1a5f644f5ca75c2ed9b01330dfbe019367dbec1a52ff1f630fcd2301008d64262e31d7608fd74d5402e30d337d51e032e2104b6b12d9 SHA512 c14a45936b934d6ea7ea7306aab1b64e2bbf444f70710a532e21da9df5cf0a6c48a1edf80295bbceac69bcef41e9972c38e3eba16fdf4d9410d3af39532de25e
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
index 3cf8d5ac8f07..bb50a601778d 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index adebc1a6c992..c3569c4adfe5 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -16,6 +16,7 @@ EBUILD libprojectm-3.1.1_rc5-r1.ebuild 1154 BLAKE2B 685c52406b461d66b74e495f5aa2
 EBUILD libprojectm-3.1.1_rc5.ebuild 1107 BLAKE2B 79a6a20446cc5b54b52a32bbed793ac95f6f69e4b51e221bf2b927b171067ad7686a855fe407b6a12cc06e4b11b9ca626544946a90aec1017cf2a06012d995f2 SHA512 bd5b12c2f2355ad2a22c396df652ab23613982110223e6df9c4370662ca966a7c153edf595dd26b0f2cc5c841e356fa7bd923cab763d0eb7f25f17a8e595d7fe
 EBUILD libprojectm-3.1.1_rc6.ebuild 1154 BLAKE2B 685c52406b461d66b74e495f5aa2c54ce4b7e84f8cda7c3d6e84561641393d7047d193063ae7a6dfab2f95bc0e630db0964e13f9068795fc07bcecc2eb7acc62 SHA512 716b5fc4348cdfca53bef24b598600602a56acbaf7f29548509b2ff1de8988fb8b8e95c5f91e5bde5acd8ff86940dc309468ffc7cdee0d4686ea704929940d45
 EBUILD libprojectm-3.1.1_rc7.ebuild 1154 BLAKE2B 685c52406b461d66b74e495f5aa2c54ce4b7e84f8cda7c3d6e84561641393d7047d193063ae7a6dfab2f95bc0e630db0964e13f9068795fc07bcecc2eb7acc62 SHA512 716b5fc4348cdfca53bef24b598600602a56acbaf7f29548509b2ff1de8988fb8b8e95c5f91e5bde5acd8ff86940dc309468ffc7cdee0d4686ea704929940d45
+EBUILD libprojectm-3.1.1_rc8-r1.ebuild 1224 BLAKE2B ead3781dcdb253a516603b31fc4f086e7915d2b968049392e1d7ff9103d2dcc14165fd6ad8e5b6e99e9fdbf3fa7adce081cdc0b21f8e2b19544ab9f6c4f30df1 SHA512 bc54040af535ca7145e4dd35c74720c75301474a88d0ac8de5f57f9270343d2158fedcd40a2cbf5470e64cb2e5cff40ea7bb46643dc14f44c3b3c238ee2ed97a
 EBUILD libprojectm-3.1.1_rc8.ebuild 1154 BLAKE2B 9ac324a805bc81a66c63a9c0e2965d36f8f1684752b5022efbf766d54f7dbf45c3c42c5b8bfb28de5997f8797da2ef0ae8c840119a8e6bb2826dcf6b50a8c909 SHA512 902e7ba5729b30905ab94a2ae2389c1a7a67e435c2fee0cc523a40486b4e854c990f230a957c01d5eb4a42b8d58c0bcdffcf5241b331b95d2754895e0f7597a1
-EBUILD libprojectm-9999.ebuild 1154 BLAKE2B 685c52406b461d66b74e495f5aa2c54ce4b7e84f8cda7c3d6e84561641393d7047d193063ae7a6dfab2f95bc0e630db0964e13f9068795fc07bcecc2eb7acc62 SHA512 716b5fc4348cdfca53bef24b598600602a56acbaf7f29548509b2ff1de8988fb8b8e95c5f91e5bde5acd8ff86940dc309468ffc7cdee0d4686ea704929940d45
+EBUILD libprojectm-9999.ebuild 1224 BLAKE2B ead3781dcdb253a516603b31fc4f086e7915d2b968049392e1d7ff9103d2dcc14165fd6ad8e5b6e99e9fdbf3fa7adce081cdc0b21f8e2b19544ab9f6c4f30df1 SHA512 bc54040af535ca7145e4dd35c74720c75301474a88d0ac8de5f57f9270343d2158fedcd40a2cbf5470e64cb2e5cff40ea7bb46643dc14f44c3b3c238ee2ed97a
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/libprojectm-9999.ebuild b/media-libs/libprojectm/libprojectm-9999.ebuild
index 19885a4052bc..ec8f42efd454 100644
--- a/media-libs/libprojectm/libprojectm-9999.ebuild
+++ b/media-libs/libprojectm/libprojectm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,3 +54,8 @@ src_configure() {
 	)
 	econf "${myeconfargs[@]}"
 }
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index bc45c06fc558..6e3d43af6009 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,5 +1,3 @@
-DIST suil-0.10.0.tar.bz2 159059 BLAKE2B 1293d817df7e60cd89946c3f5b0e6689b0942284cc2f25a93bce830e9f43db1e93067d1a9e85cf201ab8bf580cafefe06c46cf100a855a590a58022f3036d3db SHA512 721b73d987c1712e82493386e5d71957002c8a713595fce4372f1a5eb306c64a559db1ca794cec96295f72e22a9c0e9193f9a68b7f5846f2db45ce16b253fbea
 DIST suil-0.10.6.tar.bz2 347615 BLAKE2B 667379c6290c4c1e03168911fa58b991e95bbc7c7477606e42ba39d33645f4580ea09051d294f24cdbb3b2df9ed1d415b73eda3ec1f593fed2e7f2d9ff2a85c3 SHA512 b23ffe0c0ae25467b2cd60117a2efa8c13132c8e5612619e4c9ad2cc228b835f1c7fd384db62b74d4a327e3708f189b6a91f972756fcafe501308adb732c3b36
-EBUILD suil-0.10.0.ebuild 984 BLAKE2B b35418ccb188e9a0b331fa85d06bee6804e3f0354af14bd68e6508b70ca4686d17ef93b223e9fb9a68cded0dfd0930ed8980cd1b2387e2138979c0650a8d15b3 SHA512 3e28070a9692a32e8d0d8560f1202702207655838f3c9e26cecbabf58232eb945de1226298b11d00c72df7b17b7972c4a36562193aae9d18a1f04b431136b422
 EBUILD suil-0.10.6.ebuild 1023 BLAKE2B 169254c78e5787f54165093592565771c48e2c0c86c9fd782a1f91239b617cfb55daafa8529fef632e8d48636f6af8129e64b31319fd4f4b957b0dec8d2c2f4c SHA512 ae2783d0cdc545108b62f27d047fd35ed410672a0b5543c17bf16402bb2413ed5eaf85d42b6a01d036ace191d699ea07c8b7d552e3d91fc5279edf621f355741
 MISC metadata.xml 491 BLAKE2B 8d423d4bd56c2fc586cac7dfeef9ba125799795a02f8f7303d1e657e83181ad68eae5e20cc75806fefbe1296f0eabc632fee3824b9b36e7ccef0a22e04fe4081 SHA512 c56784f3b84159aaa284b5b04ce4d2110d78acb536ea9dd60d5043199a061171dfd0272f4d810e7ac68025fb906cc021b36f099ea966bc87e0de8f57464a88c3
diff --git a/media-libs/suil/suil-0.10.0.ebuild b/media-libs/suil/suil-0.10.0.ebuild
deleted file mode 100644
index f9f344f49c6a..000000000000
--- a/media-libs/suil/suil-0.10.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Lightweight C library for loading and wrapping LV2 plugin UIs"
-HOMEPAGE="http://drobilla.net/software/suil/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc gtk qt5"
-
-RDEPEND=">=media-libs/lv2-1.12.0
-	gtk? ( x11-libs/gtk+:2 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	default
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--no-qt4 \
-		$(usex gtk '' --no-gtk) \
-		$(usex qt5 '' --no-qt5) \
-		$(usex doc --docs '')
-}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 349628c87a46..258bb12accff 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 9a9af40dca99..23ca5fb3d465 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -10,5 +10,5 @@ EBUILD alsa-plugins-1.1.1-r1.ebuild 2716 BLAKE2B 6e4e45f7b9ebe382dedb7e8bf50c186
 EBUILD alsa-plugins-1.1.8.ebuild 2827 BLAKE2B a5e309ad5662798bbf610d7b3fba5fd9e4e88a1c25d31f9ba10416d3742befc1f154734a63f61ec46331619ab8eeefde4c4bd10885c27f2db4ac16c6a01a9c04 SHA512 5533b26e27cbd24117c78271894e7927798739e1e1fed10565cdcb7c54f7cdcef876d81f2e0fec6d4015a19ec91b27c950e444e9712a194c6875bde9569aa499
 EBUILD alsa-plugins-1.1.9-r1.ebuild 3062 BLAKE2B 4f3c293cb62f94c98bbd36c87c9c5d938e2227f614170fb73c7d8d6dec8e6c80044f40660b0b77928707168dc0c94616c667c52da6aebcdbe58f45b8842669da SHA512 d89d0ebb3cb11c663d50f0f6102312a4f2dca3a3147947d02b153311b0afbedda5e83ac76576c4b8df66e9bcddba362e81c755923551f4a062bfa96f0361b893
 EBUILD alsa-plugins-1.1.9.ebuild 2937 BLAKE2B a914f7e422132f2348a401abbd1412bc66e3eaebb10e16aab5f0a0c4c1ab75663d4a180fe11aac835af7413fa07f02931c15c8aeaf8c9a7fd9bf2a4d6a07a7ed SHA512 2e699ebbf819a744489f65a9844cc92654b1b5a1225a3da8ce8aa7842dad5dd0cc3154040926f0871d3011ed8715e4542e5662d7abfbd61ffc5a125da817e135
-EBUILD alsa-plugins-1.2.1.ebuild 3068 BLAKE2B c33cf4ca6eb365c61dcbe469d1df0bac8b66d1326c67528b6cf45ac6b881806ea42abf73832f33c4bb96b4595a91308b2ad4000ff27d4b6b298bff57555cc459 SHA512 20ad08957f0f4770c6a80774177f9bb26fdbe494d4bad9319c8dafdac4e5969b7e728999d54559db8f1b0217e2016a2d304df45ce4d39d04a453ceaaf996ed83
+EBUILD alsa-plugins-1.2.1.ebuild 3066 BLAKE2B 11aa4072cd826d3a2ac4718764037679286f34ee7d412533613b4b3c672e2bf2675e3c0f88cd21c900ca9dbf11cd1512f18047ffd162582b69d5fc5d8b77c760 SHA512 69393e481233995f8870574709dd3b6e8a6c277c2115808c25a741b0ac0ce0514d984b23c045462af3bb90f22baa5fe1f15e09d3216a1a90c0238795b002f5d9
 MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild
index e967ebd7ba5e..04e83d70b259 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux"
 IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index 9648f20a41f5..6e19888b433e 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1,3 +1,3 @@
 DIST gstreamer-vaapi-1.14.5.tar.xz 1068344 BLAKE2B b98363981dc7f111fc8c15188d31dea394b7f6cf300050b95d564b75020931a0f8690d11410f2d3d18d6649ef2ee290c933c3731b4bc3ca43bffb57a4c1bf542 SHA512 287df56ad9bb3fd0754b9f307082eb180c8f0b622e2c9436c5dcf2272a5fb620cb18970726d231688837d52cb169a10e98e14160e51fd82198c34ea612c0d60b
-EBUILD gst-plugins-vaapi-1.14.5.ebuild 4319 BLAKE2B 3ca09ab2034b20d6d7743bc4bb20a1fd5ffe3f70f67033ff8f368f902c0dff118bac399c1d5276ecb57cf33dd9edb6efb946554d36886c59023cdc09e36cde1f SHA512 c7099d59ec2f42addba8f79ccdeb6737fa9f509455d16be184960166281129922fa6c455d09af63cae90b53a7efd0ee350f7e2f474421208d1feb1380436cb99
+EBUILD gst-plugins-vaapi-1.14.5.ebuild 4326 BLAKE2B 3a4f15fa01265c69f1e65717c180375a621188523cb306ee957185b0504ad70b6ef1513ea562c83e5feffcd49b3e384e711612be60b95386c1dfb5de5a443b66 SHA512 fee4f766032af2310eda0567c2c3b911faae5720c773615277a675696f786b6f6c720c932d5d51b41c53be4c1aa7b7ec2fc7658980bfdbdc12c2dd34f8e9280d
 MISC metadata.xml 433 BLAKE2B d46828441b89363cce84ff10747ad13f30329aea96cf2acd2fc7deb786c3f3ec0ec5a86011657d39ac905f9f33a3904b38860b16f53cfb150530cc4142f1beed SHA512 366bbe78a862a65a8b82ee43521508db5766cde3a72f4ad8e7f0b703dc23347589e07dcfdb3f3ec12e62ac91adb38b2a58cee5dff4732069ac2b8724524a405b
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.5.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.5.ebuild
index 79f8f43c4790..978f1152fdb4 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+drm +egl gles2 +opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
 
 # gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index d4f360229af2..8d28f91ad7eb 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index a9da2cf61f31..fb711e56881e 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,6 +1,8 @@
 AUX fix-bashism.patch 547 BLAKE2B b04673f95b56dc9258b2953e90aabf81b2ef3d2b7bc7e3aee736dad07c96bbb962ddb37061713ddebf39f543bc1ad46c2667345660e07aed37576487e95d8dd8 SHA512 4e37cac97a340171fbe995fa17b63827e278ce1b46fdafbd82ed03c5967565e1e09348d43fec9801a500e3d3793dde3111fb4c3bd4b0541cb2a0696e78f645a9
 DIST flrig-1.3.46.tar.gz 813126 BLAKE2B e88186958eb7f4492a564135144d77abae782e8d249c9678663625a0cab9b9f716f1fa616062eecfb8b0c26952e2399a9120cc0a7ddcc5ad43f8bfdde400afde SHA512 e5d02632806d5f899abecc84fe7f8d1610153ace260d9c812221a37a781dd9dffe48602507f798c98d510d79657f4deec69ce2e1513f7b51f3d60888d9c07071
 DIST flrig-1.3.48.tar.gz 813746 BLAKE2B f86effa913ade23c50c3e1fb663e0c9daff0aaefa0e4457e10e1ac67a666e548dc1668a6e1a496cc1407a267e8f047829dcee1b0930fd1db04b28c2458a3da69 SHA512 2336c3ccb4112cea52daf07d2fdf0ced400c3b32e82b13faa8287fdac0634ac8f4596f4cd0efc8b30083a16859539d9da066c51f74f32e05d77bf02bbcdb087e
+DIST flrig-1.3.49.tar.gz 838092 BLAKE2B 6f4eac6203b6d48ac41f76301e166d94e3ee81bde0b1492640a6ab550775a7bea8cee4b18476756a68edf01f9a79b39f80182c77ff65549e15fdaddc2e8c4469 SHA512 5f9f46fbd0e889abffad73f39e98d9758aaaacea3aae94c5e4a8d58e15525e312eaf573f68b98f2379072e4ae64b85b01447369c736c408e60fd286e777c61d6
 EBUILD flrig-1.3.46.ebuild 583 BLAKE2B d01710a47858736fb029b80964358f04fc97e1ae43910dd30bcfe9215a7b25f1d12f6cb2c3770b955842a3b556f3dd42bd5f57dbd42207b50190a69175220109 SHA512 abd6e1edcec87c95f922b66225286ed16134e57ec8a304bd38a7cb52ae5190f3042dabac4629a7d41d870d444f32e485208c769f57fd79c00625d67e1d67ba79
 EBUILD flrig-1.3.48.ebuild 583 BLAKE2B d01710a47858736fb029b80964358f04fc97e1ae43910dd30bcfe9215a7b25f1d12f6cb2c3770b955842a3b556f3dd42bd5f57dbd42207b50190a69175220109 SHA512 abd6e1edcec87c95f922b66225286ed16134e57ec8a304bd38a7cb52ae5190f3042dabac4629a7d41d870d444f32e485208c769f57fd79c00625d67e1d67ba79
+EBUILD flrig-1.3.49.ebuild 585 BLAKE2B d3e69851d8f35bf5cbc5ee58923018663be29b6fb6193b6f8f3f8d03124f6f307bf7970412c92213187a8fd3e45e65c6438b55c67d4af1e252d9367e19487b35 SHA512 9f87e5a57a2fec7c8a629a627a87a535001b8566320c24411d9d2557cddda831a976981ef7066332aca7e5ef8a53b77d4e6579b7edc8d7a06c5bbbfe0c3d9ac6
 MISC metadata.xml 325 BLAKE2B c4c98ed723dff91c8935c44ee552e25a08366edb7b73593d29d790622a49e130ef56137de21e1df16e1f968b1d5a0c984ce6df5b817a39f38523fb71353a3e1f SHA512 ca601e14e79450d08e0679e86827071a323fbc60cdf89412257747490046ca6efb2e78ae27f69c0e3ad449427049a35d478f2a7524a0606658ef9b302d9c0d43
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index 7668311e226f..b5090bf66537 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,7 +1,5 @@
-DIST tucnak-4.16.tar.gz 3526223 BLAKE2B 1e88157a2fc023cc115a9cadfffa7516eac2ff23e4fa5aef7d7f4a959899cf5d7be99a6d934eaee1c32c1b702ca5b5e37a82dd91b7ea03d7ac21815c2e8c0c63 SHA512 65547fd4f83d41bdf312d61c0b6d750c5f949399821c5298731ee6941de0bc95290e90a004c22d731319b0bbd7b55f0d512c2e616ebd43f0c35698cc940594ce
-DIST tucnak-4.17.tar.gz 3520755 BLAKE2B 6628d628cfc7770fdc02611ec7d21410dd910601c8159052f0d2c2d5754de7f3c9360b8f43b60ae3a27eac92808a0a8254efdba5198684b19662b8fdb32a43a8 SHA512 1f59bb47c302df03ac2f6420c71d3708b94efbb74642eb403f0ee6e29bb6826f11cb606d1542d287d776908af8f9c3d9724b20d4678fb8c3ea1cadb22255ec20
 DIST tucnak-4.18.tar.gz 3527134 BLAKE2B 2e059875fb22a9027dde486d82eaa2bfd1d339440b59ffbde3b3923365096e4e7a77edc0690d79d66d1b9b218b2a7698b7783f1f07c0a8f94bc002ee5acc8528 SHA512 9c986bd4e9221a2956722423d8c31e3e420d5f50f2c68577a73d62f5e0913e79526dfbbee29e9f98f25445e35587a95aa709d538e4ba5e17d739a1220e41f0de
-EBUILD tucnak-4.16.ebuild 1966 BLAKE2B b918e611e92f3d68bae29f3f5a8ff297e98f6db7a2908bd2de4078d960220a82bed0e60d5e5677418bcb6b5f6375b760710cfe057c7d475185bfa2b728abe50e SHA512 2d3cebfb599a2f255d2ed81c3c955d728b6e4806074772898a3adb90a8cf814a420c2976040dbb6b0b9dcbe82bbe74ace3c5151d90f3b0cefa7db7a7134bfdff
-EBUILD tucnak-4.17.ebuild 1968 BLAKE2B ab961c009dfce4480636df84be8d15fe78978bc0d6c687c97cf6177de6953bbd7796e99431cb42fdf22ed4ce13826ab3e6a9aa7d374503e06281efecfcbfc5c1 SHA512 bafc882e0672d04191c4993515d4e93d3de70f8531333f8925c46cabd2d842bfa2eed63c0e791d960540af64a4b4b5894d7c61e817e8faec598ac79e9c1d1ed1
+DIST tucnak-4.19.tar.gz 3542661 BLAKE2B 0ce6b387f47bae01b21a9c63a8530f8eb0e82c9ba5c7c983190c43e11cbc18b477c30db4f5f3fe743d7a99de9fd1787e64f018180338856e9f8306a3f5849a5a SHA512 4217a073f3b085fd11e92d3eb38386563f7cef022c0e30bc959fd6d6ca6b2efaacfcaa9dc5f48208114490a414e4cfc89bb500560d7f3add28f9534eb205a8f8
 EBUILD tucnak-4.18.ebuild 1966 BLAKE2B b918e611e92f3d68bae29f3f5a8ff297e98f6db7a2908bd2de4078d960220a82bed0e60d5e5677418bcb6b5f6375b760710cfe057c7d475185bfa2b728abe50e SHA512 2d3cebfb599a2f255d2ed81c3c955d728b6e4806074772898a3adb90a8cf814a420c2976040dbb6b0b9dcbe82bbe74ace3c5151d90f3b0cefa7db7a7134bfdff
+EBUILD tucnak-4.19.ebuild 1968 BLAKE2B a5eab8af37cdd38ea0b0f9b0c4da56a7a137c64e1448d986a5a5078d13674bee0eeb48064d3d415f708a9edb3ae8a97f8a946de4d829d4a6931294c43b806af8 SHA512 8143e9ab2b5abaaa2d31b215fbd9b26bf2d28f848ef707caea24378d08d0799b4cf477bb9a5d15b06e0617bb7a21c5a3d5ba35bde1e58735102d517781a06896
 MISC metadata.xml 408 BLAKE2B 80978177d2257cefae04860fc52e43ea7f0d2221bf4a5b3050fe8057acda81625117b1ba74e7357d40d00cc7fbd44f2dac713494cd8d20679c690cf851e1b678 SHA512 ad015a404c42d5cd0f160907400f545698045bb6c7c3da59816830ec6ed51938a02988c59d4a9ade472a78fd39feeb49ebe6c2a9c625e535a37e44bf19db1b17
diff --git a/media-radio/tucnak/tucnak-4.16.ebuild b/media-radio/tucnak/tucnak-4.16.ebuild
deleted file mode 100644
index b78b8fb5f572..000000000000
--- a/media-radio/tucnak/tucnak-4.16.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic multilib
-
-DESCRIPTION="Amateur Radio VHF Contest Logbook"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa fftw gpm hamlib suid"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libzia
-	media-libs/libsndfile
-	>=media-libs/libsdl-1.2
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0 )
-	gpm? ( sys-libs/gpm )
-	hamlib? ( media-libs/hamlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply_user
-	# fix destop file
-	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
-	# fix doc install path
-	sed -i -e "s/docsdir/# docsdir/" \
-		-e "s/docs_DATA =/# docs_DATA/" \
-		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf $(use_with alsa) \
-		$(use_with gpm) $(use_with hamlib) \
-		$(use_with fftw fftw3)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
-	if use suid ; then
-		fperms 4711 /usr/bin/soundwrapper
-	fi
-}
-
-pkg_postinst() {
-	elog "In order to use sound with tucnak add yourself to the 'audio' group"
-	elog "and to key your rig via the parport add yourself to the 'lp' group"
-	elog ""
-	elog "tucnak can be used with the following additional packages:"
-	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
-	elog "                             (No need to recompile)"
-	if use suid ; then
-		ewarn "You have choosen to install the little helper program 'soundwrapper'"
-		ewarn "setuid by setting USE=suid. That helper is only needed if you"
-		ewarn "want to use morse sidetone output via the PC speaker."
-		ewarn ""
-		ewarn "While the helper should be safe by design be aware that setting"
-		ewarn "any program setuid is a security risk."
-	fi
-}
diff --git a/media-radio/tucnak/tucnak-4.17.ebuild b/media-radio/tucnak/tucnak-4.17.ebuild
deleted file mode 100644
index f97b30dca3c3..000000000000
--- a/media-radio/tucnak/tucnak-4.17.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic multilib
-
-DESCRIPTION="Amateur Radio VHF Contest Logbook"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa fftw gpm hamlib suid"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libzia
-	media-libs/libsndfile
-	>=media-libs/libsdl-1.2
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0 )
-	gpm? ( sys-libs/gpm )
-	hamlib? ( media-libs/hamlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply_user
-	# fix destop file
-	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
-	# fix doc install path
-	sed -i -e "s/docsdir/# docsdir/" \
-		-e "s/docs_DATA =/# docs_DATA/" \
-		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf $(use_with alsa) \
-		$(use_with gpm) $(use_with hamlib) \
-		$(use_with fftw fftw3)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
-	if use suid ; then
-		fperms 4711 /usr/bin/soundwrapper
-	fi
-}
-
-pkg_postinst() {
-	elog "In order to use sound with tucnak add yourself to the 'audio' group"
-	elog "and to key your rig via the parport add yourself to the 'lp' group"
-	elog ""
-	elog "tucnak can be used with the following additional packages:"
-	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
-	elog "                             (No need to recompile)"
-	if use suid ; then
-		ewarn "You have choosen to install the little helper program 'soundwrapper'"
-		ewarn "setuid by setting USE=suid. That helper is only needed if you"
-		ewarn "want to use morse sidetone output via the PC speaker."
-		ewarn ""
-		ewarn "While the helper should be safe by design be aware that setting"
-		ewarn "any program setuid is a security risk."
-	fi
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2e5f6d8b17cc..ccb434358483 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 85745f5814f0..f2142ceb31ba 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -14,5 +14,5 @@ EBUILD alsa-utils-1.1.2.ebuild 2217 BLAKE2B 2b0293d7f3acf6bae13cd1aaa341509b9fc4
 EBUILD alsa-utils-1.1.6.ebuild 2267 BLAKE2B 62b70e332647004bb076720a4fbe6ffcb62cf5cf681d928bfd774bcccdf27aeb9360ec57f1bf40e2054b8214e45fcc865a9c954ef819e8754052b03cb8858e17 SHA512 d2df64e3857c67b5a144af362aa3986346c379b0e2b8530688f10fafc8ffe2e8d81c33cd416bdfe36c2102e3651d09c77b61d1ca12b07a465e38275215654a39
 EBUILD alsa-utils-1.1.8.ebuild 2338 BLAKE2B 3618d6e3a8983cdac336f7c68e2c20e7ac0aaddc535ca83f7f8a0f4e2eb4acb6cc0931184fc8d23756b509f819581555c361ec2b3d6a41b6023f359ae66476f0 SHA512 89fc70da32aa126e27a76468adaf91dd05509a0347abc934d87945a618a1e1749f032e7b63d82cc1dbc2c9b5755b98abe1d7ad17fb0e14aedfc937021abed028
 EBUILD alsa-utils-1.1.9.ebuild 2423 BLAKE2B 27a87cd73011e680060fa04173aaff943b6b7674a0b937588c6421ae2f25bdd5ac1b37a15ec5a80a5d1ece1548275c6892e12a79564a8e3953aaa8ab596ee676 SHA512 38c1fd5cd8463d2cf4dabd3b509ff2270ad33f0c6fc3afba73560563767c8432baaf03bb315876f54ea0c2ebc6dbff23b8ae90599ac2f4cb1d8088f2d72711e2
-EBUILD alsa-utils-1.2.1.ebuild 2343 BLAKE2B 8af40664176b0dd579b4d35899ebcb6ccc79f04e46de1decbed3b6c35954ca68de34abb36a618fed3c3293594b615de10bfd5eef8228642a64e74046fefbec5d SHA512 6dbdcd8981626c55715f9c9a46e8366459255de298c4439116ab8249df5c6646e446d26860e217faa909d0deb10abb26f30a04ba11a5abf759f4db2cbb5d6f5f
+EBUILD alsa-utils-1.2.1.ebuild 2341 BLAKE2B 9b278cb091d2dbe63651b3440fee69e2f9baa44dcae94db1c7b915da70c2e62f13edddfd46c06d8ab491f8f95873e61ecb3c49c639e96edc794a8a8825d0912a SHA512 ef99e681e8b2f669380195d82892acc218feb3c947597eaa9a4e49b44f34feb807aa941a54cfce6255a85092c043db61c87f8c2ed7057cb05503ac4af8fbaff8
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
index ce530d31fd62..82d637ad6d51 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index e00bd3c28ad2..93248d820553 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/baka-mplayer/Manifest b/media-video/baka-mplayer/Manifest
index d5e04220d467..256244a6bcbd 100644
--- a/media-video/baka-mplayer/Manifest
+++ b/media-video/baka-mplayer/Manifest
@@ -1,4 +1,8 @@
 AUX baka-mplayer-2.0.4-gcc5.patch 1251 BLAKE2B 9f514f754499f5b44ae4a077c2025dfa0a9949a5594c00cb1cdb7bd2fb22e1a113ea864076e7d6846bbe07f75e86346bf65a518c4ebf195d83b59aed22e97962 SHA512 3d6b76227c465869a4497f51cd5b7759d038638a02aa821acd099edb7f4f0fe99dbee145687d286eb40cb7dfb840fdee40625c663476630064e9e88a7961fc79
+AUX baka-mplayer-2.0.4-mpv23.patch 782 BLAKE2B de90ac31fcbdd1cb9fb00eae1e282c6ff7e5ee14dd81bc2d8e07bd36250dcffa5de74dd83f2558bb15cae54ca83279c20f2776f315eea7f5b7a946e53a2e3f82 SHA512 9fda60f3569b88eb71d42562ef1650bfd125bf69f80b25ff1c123fb7efda524b7c14ae1f782d1786e9e68263f66db5af95a30c4e2e87468782da750eacbe456f
+AUX baka-mplayer-2.0.4-playlist-regression.patch 886 BLAKE2B b2c0edba4a2a0da89494dec05b78e7768a24af94f06fcda7fa4c4066800e673d551ed82f6b45d14f3f7f2d6d855d3e0be8535b5a6d3093fce90a9627e9f3c5c5 SHA512 3905ce72374c59edb09ed5a311ff257da3010386de9b076de516bd008c23d7e757d7c63151ac350bdc281a575b6387a96a44d1ac5e2229a1a325a3dfc5e6ace4
 DIST baka-mplayer-2.0.4.tar.gz 988060 BLAKE2B 4d73e6626bab90b2ac818fdc1b0d8ab7758a924805ca8356c6fa94d25df9acbfd53d7e997b58e5c85b68e033f83ce89d6e3b0c3e30ecc23d7d75b4bf74ae0911 SHA512 7898d65e87540bcb528d429dc70daefc7d4c0711b2983326cf6fa3a14e566c2742334378befdb710b8cc59452f960bc17b290058ba9e6878e830de6dbafce55a
+EBUILD baka-mplayer-2.0.4-r1.ebuild 1386 BLAKE2B bff10b72885f754032984406c8ec9265e24046184a019aed9d993cb4bc8b3f60b75953a2bbfe041301d67bfd9c6d1b7ecd3aa8a2d1307e99a0a20ab53175ae62 SHA512 da5f264567e9f5f576833b1e9a452350a0f1dc62f1edfef09a2465f89b4ed9e3a243c48ca52cc738e4361b409a9d692285be3564e24e34bffb868b04851af742
 EBUILD baka-mplayer-2.0.4.ebuild 1135 BLAKE2B 22e814220d9493f077d266aee064a279e105d4ed4d35db3ffb8d3447b99580a9abe380042a1bd9a8fa9fe68138893f90bfff657c520168ff8d4cea1e73201431 SHA512 21bef7f1e283eb3a60cacb6502525ba46299aeaed11ae77da182755428adcfb526027452fbcdf80576854fa9d05d6eae5f720d9e10fe0e8ea5af649eb201a8f3
-MISC metadata.xml 467 BLAKE2B c85208c43956d571ffe61e133ed6eeb11cd3f811e94c023cccd98915802a80bb3600680f742b78fbf8459b12e06ed4033b7170119591157485e812892d693822 SHA512 7a66080df67604b34cf202ddbc2686186d0558ad6caa2ec0d9f6596ef5f410b238cebc28b61eea5738445954374f9b81bce14a2b3269c537f734a20612c68c5d
+EBUILD baka-mplayer-9999.ebuild 1187 BLAKE2B f2ce2028cc9c86799e1e676ccc4cf8fd2fd8dd663605deb74801ae812471295cf1f6537dea13a1960400abbc7f0694ed7015688ea2097575738227598fc8cf25 SHA512 c345059930ff6da0691eddd5e6c3a4c5c445af70bf4bb26b1492a65c337ad3c091455e2a22df67dc918774f7712971e727a9f3accd993adca0e6a3ce942cea46
+MISC metadata.xml 710 BLAKE2B 14de96f0e5bc84ecbd15d2d0518e6332fdf022a850464a1e56eb1338384ebe7eafb1d1ac016779eb95717b03331c6c9eb2592b7db5efe9ab9202c33a07db3e42 SHA512 17f1484753f6610e64013d76077e0963a6475861aec91af9f3b16638d49886038c8d40852eabc6eacf6a9f0429d5290700d9a19e1e69ff63049fe8fe50131a30
diff --git a/media-video/baka-mplayer/metadata.xml b/media-video/baka-mplayer/metadata.xml
index caeecbbcc447..0e74b241272f 100644
--- a/media-video/baka-mplayer/metadata.xml
+++ b/media-video/baka-mplayer/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>cstew764@gmail.com</email>
+    <name>Christopher Steward</name>
+  </maintainer>
   <maintainer type="project">
     <email>qt@gentoo.org</email>
     <name>Gentoo Qt Project</name>
@@ -9,6 +13,10 @@
     <email>media-video@gentoo.org</email>
     <name>Gentoo Video project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">u8sand/Baka-MPlayer</remote-id>
   </upstream>
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index bde30b8eb4c0..0d80416d00a8 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,4 +1,4 @@
 DIST libva-utils-2.4.0.tar.bz2 1030271 BLAKE2B b57947f9bd63f34b27a403484ae6b66e750f854dd87c8448afb3d361581d83b20a5ffd8d7e22c9dbf5fae6f7ff3fd62d70cc248b29a862066ff10928629e4d11 SHA512 c5c674179ed589968fd296a7e33dd57a3476c237d8e15258938b364051d501e156c22b41b98fe59d6bc36805495a934dee602ec9e9bb5350c72aa65d3d300ff6
-EBUILD libva-utils-2.4.0.ebuild 1267 BLAKE2B 30b40e6ecaa9e2bb8c0f1a1594168e5c792d3449b97a1479b5aff1b436162792ac5afcf13e8c38ea8613c4d37ac651e0744db85e4f47dfe4fff5037e2f74c600 SHA512 43805f78ce0afa4237612d3880a369fe6bd4243838fba89edd6eb443ba776d286343d4fdaa381eada962ee0efc4ac9d43cc081835d75a7e2e05470b287dc5793
-EBUILD libva-utils-9999.ebuild 1270 BLAKE2B ea8ea408d29affc09374e9b44a16a8f9a79f915c859965033370867b8664012aa7cb9b10f43f1a81a3e29e975126a65ca2b43f8725af3da481a5463732377897 SHA512 c5be30ab9113ad9895f1a2046d39b21d2ee308ce4188c549c713bc48770f2a31f60d48645dedb52fc38d82924f370562a930aef57da2776b3080685374ad5126
+EBUILD libva-utils-2.4.0.ebuild 1274 BLAKE2B 0f68cfea6a566fd35bf63ff6d655ef8ddcc2e28d8cb6379ae0cf72a69abe3d2efb4df404da98bf454c24bda07e6b78c80ad0a856142d60d459e0fe48f5f226a4 SHA512 97fd99aee8f53392d1df26460ada81f940cad393672adcc3cfff42cceb58effdf841392696f564f27e23014f0799e8430675a9e9d48b7b8b238a8a4953ade38e
+EBUILD libva-utils-9999.ebuild 1277 BLAKE2B fe2f300acb0fcc91b4aa3fbffd7a587b7a06190df5e7f88b2a277cc0001f72d0c8741106db1fe7c46cb2bf16be196bb31b39f215da23a1d3a1765566c4765a6a SHA512 8b649c415532ef439847cc6639a22b2b1ca2cf02bf72b58a4aca8f518b9349801f451122fc0d0f8cba7398b1d772e30ddf26c1ea399f90386d7a3570fd82ea76
 MISC metadata.xml 414 BLAKE2B 38e8ac043ae6960cdc20190dd2f7f802b006c4d1f71920d1b699a8750a53c65ceeaa32f4d82f0699a5989f2f252daa1fbe5e2dfa330b9eb745a12cce8da045f8 SHA512 a515f432546c6063a66694fb5fbd310d498d2970cac15dea1c9497d086cb517557c15da0837f068bf28bd2e000345f95c68f4aa6170d65b960ba7e6d44e8ad57
diff --git a/media-video/libva-utils/libva-utils-2.4.0.ebuild b/media-video/libva-utils/libva-utils-2.4.0.ebuild
index f9e89f182263..e9e8647bce72 100644
--- a/media-video/libva-utils/libva-utils-2.4.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ DESCRIPTION="Collection of utilities and tests for VA-API"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
 if [[ ${PV} != *9999* ]] ; then
 	SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild
index 0f311f4f431d..b6f4b82a5e3f 100644
--- a/media-video/libva-utils/libva-utils-9999.ebuild
+++ b/media-video/libva-utils/libva-utils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ DESCRIPTION="Collection of utilities and tests for VA-API"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
 if [[ ${PV} != *9999* ]] ; then
 	SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 9753db87d614..a0fc246acd84 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e7ccdd5b14ac..c10b4dd185b9 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Jan 2020 18:08:55 +0000
+Wed, 22 Jan 2020 17:38:55 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c2d6b7bd124a..82b0a5866181 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 450288 BLAKE2B 3798da941a15fcee18382da626450662d799e35257d8ad4a0b1552a6ddaae69d623b969c7ea2a3ff528f29e7ea6067f37208f6499dc6674753bd8f0bc73ac9b6 SHA512 c989a03018fd5d5d0ec3658457962a1285eb9736eaf370cd03c34b1c2e6807a141280958db2771efc54eda1120570c478512f7e244686722c0c6fc53bcfde64c
-TIMESTAMP 2020-01-21T18:08:59Z
+TIMESTAMP 2020-01-22T17:38:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl4nPjtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl4oiLJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDPWhAAtFHVLSaOki6swGS4PTrj1Ld+soJOlIjVN0nsvfoGNqBCXhbrAZS8RHTz
-vdsesuUNzg8YijfR0f9EVdaCwTfCGeJVF0M9e85WEwBKFoJOFpGgLvVo6HHY/L3b
-zdieiXwEZoXanJT11edv2h2npVfoNYI47p75ek9ZR2O6ABArAsarvgxe4g8pUouY
-Wsx1su4FD79utiKHQn4Jzo4yo4GQpgIQ1zVkQ1j1Pem47dQNk9SphvKVRAyO/kSA
-GzHhZlX+k0sMuaHVnHgOacer5T0M/EI2KgAy0rmmSKDNbMPnW4zDk9kah8Y67y+3
-iU8/FytT9By0jyipo1xP3wOM6kHejQqERclFw6TqaCj6MpA8xGvZKghXzT77wt0V
-zL/r3wci4k2jCpw1mh3pOZQl0dT1qz1bdabJeEXjZb9M1xUAaSOjpidLzub5e92y
-qjc4PYSB+zrHT2IhhnOgxSYEWls1ditC/FnET+NA27eNdnyI/khvg8ja1r90GYPq
-ezkUw0NHooF/82GIJwA5gWcN+j3jqf339wxwQZBT2nlEWpLD5am0a8NT5QIVVPR8
-Xclg2LYIeGcH64kb1E4hhwzHGyiE/0MzZTiv9gpSJxBrDSnZBLoCjGLp+O8j/Ih5
-l30dYuwbRBwK1Zb8Vd9ky+nY/AfKkaf2LJCchirOI8mNTybRI70=
-=Ytk2
+klCNnw/9HUATgYv27PMXCwTpLQipWtWnN9chNy1LdsuvdhnLydWntLfPt33vuKzT
+47cB2yl6f2FW6ryOCaxU8pw9Ee5FwFIjfnR5Vfa9L8VVVbDakMTCitATq7AWQk9+
+PtkwfeldiSEvd1k76rhANxwlQ/k+lJQtJ5NU09apawtUOfKIs/D09ylVHlcys9oi
+ltGyAl1PyZTIt9L1u/HNaIi9mr9ltfBW8VfbKqCtkYOfvX/mghoOucYOo1SrJ1dK
+L5lQOzpC9USiy77fNAfpcrij3sAnHiaxMgg6aYXE7qysMdYcdeBwhRRrAyPYIer2
+/k7N9UsUWdJEpSItj++lJnGwR2YkSFL8UoWc0Aq2J5zHaO3Oo0ezTmtVg+jSXhbj
+tsPuSVBZtx9V6936/hLHE3RjEQftE+CcIHVoSHJaqg7G65rTHcn0IWeTQpMuZUB/
+xNSXZ/Yoqfdcq0NuAKyGBushUbInfWD1MEaHILDrsUEh2Lc90qpadA55C0OD/Uom
+ABBF60OmcePotwwBf2AcnGnrcUYQlLV/7X2+4Ye4HtJSFRhF2o7C2OXFlPMIs3Oa
+iCzmhRfNiI1nj9WTwX0qdi8bDgdqb3LhPoQMbG+quykcepaPIVpSqOWNiQg65Bvm
+emwPo2yBIO4ezxTgFjulbxkkKjT5dAX0mdogMIbbCH+xJb/i9WE=
+=LQpu
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 70d65a9cc4b4..c10b4dd185b9 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Jan 2020 18:08:56 +0000
+Wed, 22 Jan 2020 17:38:55 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index f6a9429de29e..3867551f74e8 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 5933fe2ec8f8..bad25646c1cd 100644
--- a/metadata/md5-cache/acct-group/Manifest.gz
+++ b/metadata/md5-cache/acct-group/Manifest.gz
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 39196fb16b86..8c8874ec1c2b 100644
--- a/metadata/md5-cache/acct-user/Manifest.gz
+++ b/metadata/md5-cache/acct-user/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 5db97c1e3406..109b3bf454ec 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/edbrowse-3.7.4 b/metadata/md5-cache/app-accessibility/edbrowse-3.7.4
deleted file mode 100644
index 322fbc9ab3db..000000000000
--- a/metadata/md5-cache/app-accessibility/edbrowse-3.7.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-text/tidy-html5 >=net-misc/curl-7.36.0 >=dev-libs/libpcre-7.8 >=sys-libs/readline-6.0 dev-lang/duktape odbc? ( dev-db/unixODBC ) dev-lang/perl virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/tidy-html5 >=net-misc/curl-7.36.0 >=dev-libs/libpcre-7.8 >=sys-libs/readline-6.0 dev-lang/duktape odbc? ( dev-db/unixODBC )
-DESCRIPTION=Combination editor, browser, and mail client that is 100% text based
-EAPI=7
-HOMEPAGE=http://edbrowse.org
-IUSE=odbc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/tidy-html5 >=net-misc/curl-7.36.0 >=dev-libs/libpcre-7.8 >=sys-libs/readline-6.0 dev-lang/duktape odbc? ( dev-db/unixODBC )
-SLOT=0
-SRC_URI=https://github.com/CMB/edbrowse/archive/v3.7.4.tar.gz -> edbrowse-3.7.4.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83201c60b5145fea7b3c67621e5f834d
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 8ea28d607ece..9d8fcf454711 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 1dc46999f0b0..3b540cf54629 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/hteditor-2.1.0-r1 b/metadata/md5-cache/app-editors/hteditor-2.1.0-r1
index 83c1171c87dd..a07189e3e7fa 100644
--- a/metadata/md5-cache/app-editors/hteditor-2.1.0-r1
+++ b/metadata/md5-cache/app-editors/hteditor-2.1.0-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) >=dev-libs/lzo-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hte/ht-2.1.0.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a52913f82999a17c325a8e201949154b
+_md5_=6c4e2a1b67cf88e630e2adabb38f7fd2
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index cb981b0097fd..ffca33091aea 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index b61caf677aad..dd3e36152234 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/wine-staging-4.18 b/metadata/md5-cache/app-emulation/wine-staging-4.18
deleted file mode 100644
index f938c3ad9e9a..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-4.18
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.9.3 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=4.18
-SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.18.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190511.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v4.18.tar.gz -> wine-staging-4.18.tar.gz )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0544cc211a33c6814409f9e5deabc13e
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index 4902ad35afed..e789886f2b26 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20191222.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a9a1bfda4d7a4c5fe4278c859a4442b0
+_md5_=a4aca54703f62ec74390b3dbe94d901e
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-4.18 b/metadata/md5-cache/app-emulation/wine-vanilla-4.18
deleted file mode 100644
index ff622560df71..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-4.18
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.9.3 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=4.18
-SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.18.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190511.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c01be772f8d565d6fbe61da1a27f8700
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index b9b56e962553..6661dc4a9b63 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20191222.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c657ca58c2830ef3c52ae60a5174246
+_md5_=60fd0a0d946c918000c24d934ad158cd
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 2ce9522e67d8..eed4e0e6d98f 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/ibus-handwrite-2.1.4-r1 b/metadata/md5-cache/app-i18n/ibus-handwrite-2.1.4-r1
deleted file mode 100644
index cd5940d85a83..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-handwrite-2.1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=app-i18n/ibus x11-libs/gtk+:2 x11-libs/gtkglext nls? ( virtual/libintl ) zinnia? ( app-i18n/zinnia app-i18n/zinnia-tomoe ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Hand write recognition/input for IBus
-EAPI=6
-HOMEPAGE=https://github.com/microcai/ibus-handwrite
-IUSE=nls +zinnia
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus x11-libs/gtk+:2 x11-libs/gtkglext nls? ( virtual/libintl ) zinnia? ( app-i18n/zinnia app-i18n/zinnia-tomoe )
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus-handwrite/ibus-handwrite-2.1.4.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2d630539a41e26f7b347419312927461
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 784d1b9c1894..cf2e112cf3cc 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/zsh-5.7.1-r1 b/metadata/md5-cache/app-shells/zsh-5.7.1-r1
index 8dccf7903ac6..86b358cfc1d1 100644
--- a/metadata/md5-cache/app-shells/zsh-5.7.1-r1
+++ b/metadata/md5-cache/app-shells/zsh-5.7.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=UNIX Shell similar to the Korn shell
 EAPI=7
 HOMEPAGE=https://www.zsh.org/
 IUSE=caps debug doc examples gdbm maildir pcre static unicode
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1
 SLOT=0
 SRC_URI=https://www.zsh.org/pub/zsh-5.7.1.tar.xz https://www.zsh.org/pub/old/zsh-5.7.1.tar.xz mirror://sourceforge/zsh/zsh-5.7.1.tar.xz doc? ( https://www.zsh.org/pub/zsh-5.7.1-doc.tar.xz mirror://sourceforge/zsh/zsh-5.7.1-doc.tar.xz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6cdeeee52346489efe6c9e1d4f255c5c
+_md5_=bdfe3c4c79c4730de39c084a0743ed53
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index b3e8e744ef32..6b09d611db96 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/expander-2.0.5-r2 b/metadata/md5-cache/app-text/expander-2.0.5-r2
index f3bacfbeab10..fb62ce0460da 100644
--- a/metadata/md5-cache/app-text/expander-2.0.5-r2
+++ b/metadata/md5-cache/app-text/expander-2.0.5-r2
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install postinst prepare
+DEFINED_PHASES=compile install postinst
 DESCRIPTION=Expander is a utility that acts as a filter for text editors
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.nedit.org
 KEYWORDS=~amd64 ~x86 ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b11e421f50e1793b2993ccdbeab0193b
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=71c84206f93e690e2959a8aafe760249
diff --git a/metadata/md5-cache/app-text/flpsed-0.7.0 b/metadata/md5-cache/app-text/flpsed-0.7.0
deleted file mode 100644
index 20be4f381ec5..000000000000
--- a/metadata/md5-cache/app-text/flpsed-0.7.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
-DESCRIPTION=Pseudo PostScript editor
-EAPI=4
-HOMEPAGE=http://flpsed.org/flpsed.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
-SLOT=0
-SRC_URI=http://flpsed.org/flpsed-0.7.0.tar.gz
-_md5_=9938dd814a1e09a6c9b347d0f37273fb
diff --git a/metadata/md5-cache/app-text/flpsed-0.7.2 b/metadata/md5-cache/app-text/flpsed-0.7.2
deleted file mode 100644
index 1e0a652c2430..000000000000
--- a/metadata/md5-cache/app-text/flpsed-0.7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
-DESCRIPTION=Pseudo PostScript editor
-EAPI=5
-HOMEPAGE=http://flpsed.org/flpsed.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
-SLOT=0
-SRC_URI=http://flpsed.org/flpsed-0.7.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4d74f48c4c98dbc582efce2805424e87
diff --git a/metadata/md5-cache/app-text/flpsed-0.7.3 b/metadata/md5-cache/app-text/flpsed-0.7.3
index 069b7ac7bfcc..b58f8635ffdf 100644
--- a/metadata/md5-cache/app-text/flpsed-0.7.3
+++ b/metadata/md5-cache/app-text/flpsed-0.7.3
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=install
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
 DESCRIPTION=Pseudo PostScript editor
-EAPI=5
+EAPI=7
 HOMEPAGE=http://flpsed.org/flpsed.html
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
 SLOT=0
 SRC_URI=http://flpsed.org/flpsed-0.7.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=11def3a5b7b55db65ce295d69f9887a2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d
+_md5_=708382b03550fa3df0fd418478560731
diff --git a/metadata/md5-cache/app-text/gocr-0.50 b/metadata/md5-cache/app-text/gocr-0.50
index 6ef4efa99216..e77105eb6813 100644
--- a/metadata/md5-cache/app-text/gocr-0.50
+++ b/metadata/md5-cache/app-text/gocr-0.50
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install
 DEPEND=>=media-libs/netpbm-9.12 doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl ) tk? ( dev-lang/tk )
 DESCRIPTION=An OCR (Optical Character Recognition) reader
-EAPI=4
+EAPI=7
 HOMEPAGE=http://jocr.sourceforge.net
 IUSE=doc scanner tk
 KEYWORDS=alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/netpbm-9.12 doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl ) tk? ( dev-lang/tk ) tk? ( media-gfx/xli scanner? ( media-gfx/xsane ) )
 SLOT=0
 SRC_URI=http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.50.tar.gz
-_md5_=52f9e987cc8345199416ef7528731727
+_md5_=d953d6a10841b1b710b47943cab465de
diff --git a/metadata/md5-cache/app-text/gv-3.7.3.90 b/metadata/md5-cache/app-text/gv-3.7.3.90
index dccc2a4d0343..dba208a0dfe2 100644
--- a/metadata/md5-cache/app-text/gv-3.7.3.90
+++ b/metadata/md5-cache/app-text/gv-3.7.3.90
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
-DEPEND=app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXaw3d-1.6-r1[unicode] x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
+DEPEND=app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXaw3d-1.6-r1[unicode] x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto
 DESCRIPTION=Viewer for PostScript and PDF documents using Ghostscript
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gv/
 IUSE=xinerama
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
@@ -9,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXaw3d-1.6-r1[unicode] x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/gv/gv-3.7.3.90.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a0c771fd640dd00078be9d2710c63a6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d
+_md5_=33766ae1db60753d243b76e8e009b145
diff --git a/metadata/md5-cache/app-text/hd2u-1.0.3 b/metadata/md5-cache/app-text/hd2u-1.0.3
index 4023170faf6e..edf46cc42ab1 100644
--- a/metadata/md5-cache/app-text/hd2u-1.0.3
+++ b/metadata/md5-cache/app-text/hd2u-1.0.3
@@ -1,12 +1,11 @@
-DEFINED_PHASES=prepare
+DEFINED_PHASES=-
 DEPEND=dev-libs/popt
 DESCRIPTION=Dos2Unix like text file converter
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.megaloman.com/~hany/software/hd2u/
 KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/popt !app-text/dos2unix
 SLOT=0
 SRC_URI=http://www.megaloman.com/~hany/_data/hd2u/hd2u-1.0.3.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f959d82f39c5d5e60eae5134c2e71c55
+_md5_=b46f636946b130e44543c991eed2bab2
diff --git a/metadata/md5-cache/app-text/libxmlpatch-0.3.3 b/metadata/md5-cache/app-text/libxmlpatch-0.3.3
index 6145e2996c5c..59dbe63f472a 100644
--- a/metadata/md5-cache/app-text/libxmlpatch-0.3.3
+++ b/metadata/md5-cache/app-text/libxmlpatch-0.3.3
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 test? ( dev-libs/check ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2 dev-libs/libxml2 test? ( dev-libs/check )
 DESCRIPTION=A set of tools to create and apply patch to XML files using XPath
-EAPI=4
+EAPI=7
 HOMEPAGE=http://xmlpatch.sourceforge.net/
-IUSE=test static-libs
+IUSE=test
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlpatch/libxmlpatch-0.3.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9c77eb886daa9bce79fa7a4339fbac68
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=dfb1bd0b5983501c2728797465e486d1
diff --git a/metadata/md5-cache/app-text/mpage-2.5.6-r1 b/metadata/md5-cache/app-text/mpage-2.5.6-r1
index 3c6ac3e1469f..cc761cd6c6e9 100644
--- a/metadata/md5-cache/app-text/mpage-2.5.6-r1
+++ b/metadata/md5-cache/app-text/mpage-2.5.6-r1
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile configure install
 DESCRIPTION=Many to one page printing utility
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.mesa.nl/
 KEYWORDS=amd64 ppc x86
 LICENSE=freedist
 SLOT=0
 SRC_URI=http://www.mesa.nl/pub/mpage/mpage-2.5.6.tgz https://dev.gentoo.org/~mgorny/dist/mpage-2.5.6-gentoo-patchset.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2a68ede7c86c0c5c61bbae8d1dcfd72a
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=70215cebb806ada5c87189bf3f40b471
diff --git a/metadata/md5-cache/app-text/mupdf-1.16.1 b/metadata/md5-cache/app-text/mupdf-1.16.1
index 5aeb391c7ccd..d0b7989460e8 100644
--- a/metadata/md5-cache/app-text/mupdf-1.16.1
+++ b/metadata/md5-cache/app-text/mupdf-1.16.1
@@ -11,4 +11,4 @@ REQUIRED_USE=opengl? ( !static-libs )
 SLOT=0/1.16.1
 SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.16.1-source.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e50ac083efb3de564b6b195274bfbe02
+_md5_=f926de84ab649b08c93a12c0d392744b
diff --git a/metadata/md5-cache/app-text/o3read-0.0.4 b/metadata/md5-cache/app-text/o3read-0.0.4
index 977194440e7a..206372501886 100644
--- a/metadata/md5-cache/app-text/o3read-0.0.4
+++ b/metadata/md5-cache/app-text/o3read-0.0.4
@@ -1,6 +1,6 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=configure install
 DESCRIPTION=Converts OpenOffice formats to text or HTML
-EAPI=4
+EAPI=7
 HOMEPAGE=http://siag.nu/o3read/
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
@@ -8,4 +8,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://siag.nu/pub/o3read/o3read-0.0.4.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=950a214f01fbbd3e0f1beb1d55be712d
+_md5_=cd68624a7b922e51112b55d946590a1e
diff --git a/metadata/md5-cache/app-text/pspdftool-0.03 b/metadata/md5-cache/app-text/pspdftool-0.03
index 46aefe3a639f..aa39fa4a4a05 100644
--- a/metadata/md5-cache/app-text/pspdftool-0.03
+++ b/metadata/md5-cache/app-text/pspdftool-0.03
@@ -1,7 +1,8 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=zlib? ( sys-libs/zlib ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=zlib? ( sys-libs/zlib )
 DESCRIPTION=Tool for prepress preparation of PDF and PostScript documents
-EAPI=4
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/pspdftool
 IUSE=zlib
 KEYWORDS=~amd64 ~x86
@@ -10,4 +11,4 @@ RDEPEND=zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/pspdftool/pspdftool-0.03.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3fe7fe18102d637fead080f262946721
+_md5_=1ce2bdbb3b76bd9f4b3277c89b67f241
diff --git a/metadata/md5-cache/app-text/pspdftool-9999 b/metadata/md5-cache/app-text/pspdftool-9999
deleted file mode 100644
index da4e61c2325f..000000000000
--- a/metadata/md5-cache/app-text/pspdftool-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=zlib? ( sys-libs/zlib ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
-DESCRIPTION=Tool for prepress preparation of PDF and PostScript documents
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/pspdftool
-IUSE=zlib
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=zlib? ( sys-libs/zlib )
-SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	1086a6c20b5a06e9f05f3128525fa694	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6dc198e9bcf423588ceb0ac9b289eb41
diff --git a/metadata/md5-cache/app-text/rtf2html-0.2.0-r1 b/metadata/md5-cache/app-text/rtf2html-0.2.0-r1
index dd326ade2c67..49984009b444 100644
--- a/metadata/md5-cache/app-text/rtf2html-0.2.0-r1
+++ b/metadata/md5-cache/app-text/rtf2html-0.2.0-r1
@@ -1,11 +1,9 @@
-DEFINED_PHASES=compile configure install prepare unpack
+DEFINED_PHASES=prepare
 DESCRIPTION=RTF to HTML converter
-EAPI=4
+EAPI=7
 HOMEPAGE=http://rtf2html.sourceforge.net/
-IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/rtf2html/rtf2html-0.2.0.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d03f2933975e1b5216723ec5f744af0b
+_md5_=917c262e918fdd10ccd9d2c4f16274d3
diff --git a/metadata/md5-cache/app-text/sloccount-2.26-r3 b/metadata/md5-cache/app-text/sloccount-2.26-r3
index 5955ce06a06d..5d279d36774f 100644
--- a/metadata/md5-cache/app-text/sloccount-2.26-r3
+++ b/metadata/md5-cache/app-text/sloccount-2.26-r3
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/perl >=sys-apps/sed-4 app-shells/bash
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-lang/perl
 DESCRIPTION=Tools for counting Source Lines of Code (SLOC) for a large number of languages
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.dwheeler.com/sloccount/
 KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=sys-apps/sed-4 app-shells/bash
+RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://www.dwheeler.com/sloccount/sloccount-2.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=14907117129dc5f41e1d878a455a3ef5
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8a056caa582bde5a3f3db48bf3672b76
diff --git a/metadata/md5-cache/app-text/texi2html-5.0-r1 b/metadata/md5-cache/app-text/texi2html-5.0-r1
index 8ad6d4ea73cb..01ff2c1367f1 100644
--- a/metadata/md5-cache/app-text/texi2html-5.0-r1
+++ b/metadata/md5-cache/app-text/texi2html-5.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install preinst prepare
-DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/libintl-perl-1.200 unicode? ( dev-perl/Text-Unidecode dev-perl/Unicode-EastAsianWidth )
+DEPEND=dev-lang/perl dev-perl/libintl-perl unicode? ( dev-perl/Text-Unidecode dev-perl/Unicode-EastAsianWidth )
 DESCRIPTION=Perl script that converts Texinfo to HTML
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.nongnu.org/texi2html/
 IUSE=unicode
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT
-RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/libintl-perl-1.200 unicode? ( dev-perl/Text-Unidecode dev-perl/Unicode-EastAsianWidth )
+RDEPEND=dev-lang/perl dev-perl/libintl-perl unicode? ( dev-perl/Text-Unidecode dev-perl/Unicode-EastAsianWidth )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://nongnu/texi2html/texi2html-5.0.tar.bz2
 _eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
-_md5_=608af1826a390d446e1acc05b79ffd07
+_md5_=fe58d925f0c156ade1dfc32294ace873
diff --git a/metadata/md5-cache/app-text/uudeview-0.5.20-r2 b/metadata/md5-cache/app-text/uudeview-0.5.20-r2
index 41719813e064..58c49f4ac895 100644
--- a/metadata/md5-cache/app-text/uudeview-0.5.20-r2
+++ b/metadata/md5-cache/app-text/uudeview-0.5.20-r2
@@ -1,11 +1,11 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=uu, xx, base64, binhex decoder
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.fpx.de/fp/Software/UUDeview/
 KEYWORDS=alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b047a58f6bebd0b0770e3e343eb131d8
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a03fd7909921ac02ba5d9105f6f945ad
diff --git a/metadata/md5-cache/app-text/xml2-0.5 b/metadata/md5-cache/app-text/xml2-0.5
index 0449d2f806e8..d405b6496760 100644
--- a/metadata/md5-cache/app-text/xml2-0.5
+++ b/metadata/md5-cache/app-text/xml2-0.5
@@ -1,11 +1,12 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=-
-DEPEND=dev-libs/libxml2 virtual/pkgconfig
+DEPEND=dev-libs/libxml2
 DESCRIPTION=These tools are used to convert XML and HTML to and from a line-oriented format
-EAPI=4
+EAPI=7
 HOMEPAGE=http://dan.egnor.name/xml2
 KEYWORDS=~amd64 ~x86 ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2
 SLOT=0
 SRC_URI=http://download.ofb.net/gale/xml2-0.5.tar.gz
-_md5_=bc14ad416bb9f79225dcb959c4f35ff4
+_md5_=b27c97c79f6676fdd5aff5fca3b51546
diff --git a/metadata/md5-cache/app-text/xml2doc-20030510-r1 b/metadata/md5-cache/app-text/xml2doc-20030510-r1
index d06ab96fc872..4f99e6c98fb8 100644
--- a/metadata/md5-cache/app-text/xml2doc-20030510-r1
+++ b/metadata/md5-cache/app-text/xml2doc-20030510-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/libxml2-2.5
+DEFINED_PHASES=compile configure install
+DEPEND=dev-libs/libxml2:2
 DESCRIPTION=Tool to convert simple XML to a variety of formats (pdf, html, txt, manpage)
-EAPI=4
+EAPI=7
 HOMEPAGE=http://xml2doc.sourceforge.net
 KEYWORDS=alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libxml2-2.5
+RDEPEND=dev-libs/libxml2:2
 SLOT=0
 SRC_URI=mirror://sourceforge/xml2doc/xml2doc-20030510.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f52b8cc55e63b1bc054429a6eb7a5997
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=29f6d1536aaf1941757ce136f3524e99
diff --git a/metadata/md5-cache/app-text/xmlstarlet-1.6.1 b/metadata/md5-cache/app-text/xmlstarlet-1.6.1
index aa277d129eb0..2fa5b7d62bb1 100644
--- a/metadata/md5-cache/app-text/xmlstarlet-1.6.1
+++ b/metadata/md5-cache/app-text/xmlstarlet-1.6.1
@@ -1,11 +1,13 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libxml2-2.6.27 >=dev-libs/libxslt-1.1.9 dev-libs/libgcrypt:0 virtual/libiconv sys-apps/sed
+DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/libgcrypt:0= virtual/libiconv
 DESCRIPTION=A set of tools to transform, query, validate, and edit XML documents
-EAPI=4
+EAPI=7
 HOMEPAGE=http://xmlstar.sourceforge.net/
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.6.27 >=dev-libs/libxslt-1.1.9 dev-libs/libgcrypt:0 virtual/libiconv
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/libgcrypt:0= virtual/libiconv
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlstar/xmlstarlet-1.6.1.tar.gz
-_md5_=7ad12c6021fece82bf6af2d231b4b281
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d24f8d9105d9a7f2cb7fee3d0f20174d
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 25bc2cab01a5..a11fe6634d79 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/icedtea-3.13.0 b/metadata/md5-cache/dev-java/icedtea-3.13.0
index 0398221d1a40..360197c803b9 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.13.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.13.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.13.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/openjdk.tar.xz -> icedtea-3.13-openjdk-c8f86954855a.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/corba.tar.xz -> icedtea-3.13-corba-24a4cc7d7de6.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/jaxp.tar.xz -> icedtea-3.13-jaxp-7f4569c121d6.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/jaxws.tar.xz -> icedtea-3.13-jaxws-1c6f4ebde697.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/jdk.tar.xz -> icedtea-3.13-jdk-51afcf17e031.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/hotspot.tar.xz -> icedtea-3.13-hotspot-ab8fadcbbde6.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/nashorn.tar.xz -> icedtea-3.13-nashorn-69b1da223d93.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/langtools.tar.xz -> icedtea-3.13-langtools-2008b12a91d1.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/shenandoah.tar.xz -> icedtea-3.13-shenandoah-ff69edbcd7ae.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/aarch32.tar.xz -> icedtea-3.13-aarch32-26d64a5c4b9a.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2944de6ea555317f632c878f40517585
+_md5_=476838264dfd44534c398684e94365cd
diff --git a/metadata/md5-cache/dev-java/icedtea-3.14.0 b/metadata/md5-cache/dev-java/icedtea-3.14.0
index b522efd656b9..ecb79d5cb651 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.14.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.14.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.14.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.14.0/openjdk.tar.xz -> icedtea-3.14-openjdk-454c6cbb8073.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.14.0/corba.tar.xz -> icedtea-3.14-corba-a37140ba122d.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.14.0/jaxp.tar.xz -> icedtea-3.14-jaxp-9f2145980ba0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.14.0/jaxws.tar.xz -> icedtea-3.14-jaxws-af5760dceec0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.14.0/jdk.tar.xz -> icedtea-3.14-jdk-ce6c8c2cad27.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.14.0/hotspot.tar.xz -> icedtea-3.14-hotspot-4ccc1ae03940.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.14.0/nashorn.tar.xz -> icedtea-3.14-nashorn-13722b4babad.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.14.0/langtools.tar.xz -> icedtea-3.14-langtools-ccec65feaaac.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.14.0/shenandoah.tar.xz -> icedtea-3.14-shenandoah-9e52f8d3b511.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.14.0/aarch32.tar.xz -> icedtea-3.14-aarch32-0d7b61c79fee.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5c527e26ca93b0d2853c96c8dc70bb3
+_md5_=9f321bef5ecc552256dab8369129a707
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4 b/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4
deleted file mode 100644
index a8552c06f112..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:11 ) || ( dev-java/openjdk-bin:11 dev-java/openjdk:11 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=6
-HOMEPAGE=https://openjdk.java.net
-IUSE=alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
-LICENSE=GPL-2
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=javafx? ( alsa !headless-awt )
-SLOT=11
-SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.3+7.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=daa2e8fd3cf4fd75244a8ed134b510c7
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.4_p11 b/metadata/md5-cache/dev-java/openjdk-11.0.4_p11
deleted file mode 100644
index 9efe153bfcf5..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-11.0.4_p11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:11 ) || ( dev-java/openjdk-bin:11 dev-java/openjdk:11 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Open source implementation of the Java programming language
-EAPI=6
-HOMEPAGE=https://openjdk.java.net
-IUSE=alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
-LICENSE=GPL-2
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=javafx? ( alsa !headless-awt )
-SLOT=11
-SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.4+11.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eec7ecc66928a1f056350ea39370ef65
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.5_p10 b/metadata/md5-cache/dev-java/openjdk-11.0.5_p10
index e16d700c4f45..98b009b3093d 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.5_p10
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.5_p10
@@ -12,4 +12,4 @@ REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.5+10.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eec7ecc66928a1f056350ea39370ef65
+_md5_=9fdeb2e8c8344dbd272a9ebdab4f6954
diff --git a/metadata/md5-cache/dev-java/openjdk-8.222_p10 b/metadata/md5-cache/dev-java/openjdk-8.222_p10
index d683820ca5b3..a1897bae546f 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.222_p10
+++ b/metadata/md5-cache/dev-java/openjdk-8.222_p10
@@ -11,4 +11,4 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/ba
 SLOT=8
 SRC_URI=https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u222-b10.tar.bz2 -> openjdk-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u222-b10.tar.bz2 -> openjdk-corba-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u222-b10.tar.bz2 -> openjdk-hotspot-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u222-b10.tar.bz2 -> openjdk-jaxp-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u222-b10.tar.bz2 -> openjdk-jaxws-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u222-b10.tar.bz2 -> openjdk-jdk-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u222-b10.tar.bz2 -> openjdk-langtools-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u222-b10.tar.bz2 -> openjdk-nashorn-8.222_p10.tar.bz2
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4fa0c2c329c75bd22798042401326dcd
+_md5_=a766d026b192ea2b74191ae97a4ca4d2
diff --git a/metadata/md5-cache/dev-java/openjdk-8.232_p09 b/metadata/md5-cache/dev-java/openjdk-8.232_p09
index 1e54293c3496..5d0027efa5f5 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.232_p09
+++ b/metadata/md5-cache/dev-java/openjdk-8.232_p09
@@ -11,4 +11,4 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/ba
 SLOT=8
 SRC_URI=https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u232-b09.tar.bz2 -> openjdk-8.232_p09.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u232-b09.tar.bz2 -> openjdk-corba-8.232_p09.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u232-b09.tar.bz2 -> openjdk-hotspot-8.232_p09.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u232-b09.tar.bz2 -> openjdk-jaxp-8.232_p09.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u232-b09.tar.bz2 -> openjdk-jaxws-8.232_p09.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u232-b09.tar.bz2 -> openjdk-jdk-8.232_p09.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u232-b09.tar.bz2 -> openjdk-langtools-8.232_p09.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u232-b09.tar.bz2 -> openjdk-nashorn-8.232_p09.tar.bz2
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25c8ffe1da2e3a728264c0efcc6b7390
+_md5_=3b9e9047fcb85625c21d2d11b44f1eaa
diff --git a/metadata/md5-cache/dev-java/openjdk-8.242 b/metadata/md5-cache/dev-java/openjdk-8.242
index 922f2fbb89e3..6f5a618c7531 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.242
+++ b/metadata/md5-cache/dev-java/openjdk-8.242
@@ -11,4 +11,4 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/ba
 SLOT=8
 SRC_URI=https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u242-ga.tar.bz2 -> openjdk-8.242.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u242-ga.tar.bz2 -> openjdk-corba-8.242.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u242-ga.tar.bz2 -> openjdk-hotspot-8.242.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u242-ga.tar.bz2 -> openjdk-jaxp-8.242.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u242-ga.tar.bz2 -> openjdk-jaxws-8.242.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u242-ga.tar.bz2 -> openjdk-jdk-8.242.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u242-ga.tar.bz2 -> openjdk-langtools-8.242.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u242-ga.tar.bz2 -> openjdk-nashorn-8.242.tar.bz2
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b895e94db75c90e0bcc527e78f3f27bc
+_md5_=dcffc3ab9a5db8d990730925e5b28faf
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.4_p11 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.4_p11
deleted file mode 100644
index d721298cac37..000000000000
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.4_p11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm pretend setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Prebuilt Java JDK binaries provided by AdoptOpenJDK
-EAPI=6
-HOMEPAGE=https://adoptopenjdk.net
-IUSE=alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source webstart
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
-LICENSE=GPL-2-with-classpath-exception
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:11 ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-RESTRICT=preserve-libs splitdebug
-SLOT=11
-SRC_URI=arm? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4+11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.4_11.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4+11/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.4_11.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4+11/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.4_11.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4+11/OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz )
-_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68a0a2ceb9613435a7859fbcffb280e7
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.3_p1 b/metadata/md5-cache/dev-java/openjfx-11.0.3_p1
index 019ef989cfdd..7b310b283646 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.3_p1
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.3_p1
@@ -11,4 +11,4 @@ REQUIRED_USE=cpu_flags_x86_sse2
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/openjfx/11/rt/archive/11.0.3+1.tar.bz2 -> openjfx-11.0.3_p1.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.8-bin.zip https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar https://repo.maven.apache.org/maven2/org/antlr/antlr-complete/3.5.2/antlr-complete-3.5.2.jar https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bfa67fae2c8d7ff53c12caa4721a6545
+_md5_=792f79c82075be7be214b21d5c006e8c
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index a9f418a53eaa..96d1141cfb60 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/go-1.13.6 b/metadata/md5-cache/dev-lang/go-1.13.6
index 4eac1a3facb3..a882e4c63d44 100644
--- a/metadata/md5-cache/dev-lang/go-1.13.6
+++ b/metadata/md5-cache/dev-lang/go-1.13.6
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.13.6
-SRC_URI=https://storage.googleapis.com/golang/go1.13.6.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
+SRC_URI=https://storage.googleapis.com/golang/go1.13.6.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.13.6.tbz ) )
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=842b08eb28896f771e0e8abb2ba84842
+_md5_=71c468b5f6b766bbe48a01b8a17e6b0d
diff --git a/metadata/md5-cache/dev-lang/go-9999 b/metadata/md5-cache/dev-lang/go-9999
index 3db3ab223127..35c28456e1ec 100644
--- a/metadata/md5-cache/dev-lang/go-9999
+++ b/metadata/md5-cache/dev-lang/go-9999
@@ -9,6 +9,6 @@ PROPERTIES=live
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=strip
 SLOT=0/9999
-SRC_URI=!gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
+SRC_URI=!gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.13.6.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.13.6.tbz ) )
 _eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=842b08eb28896f771e0e8abb2ba84842
+_md5_=71c468b5f6b766bbe48a01b8a17e6b0d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 1d8d0b4e55d7..eeeb190fd81f 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libzia-4.16 b/metadata/md5-cache/dev-libs/libzia-4.16
deleted file mode 100644
index a59265cb6c0a..000000000000
--- a/metadata/md5-cache/dev-libs/libzia-4.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:0 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=platform abstraction code for tucnak package
-EAPI=6
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=ftdi
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:0 )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/libzia-4.16.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=103707e9c13095340630d0c890251474
diff --git a/metadata/md5-cache/dev-libs/libzia-4.17 b/metadata/md5-cache/dev-libs/libzia-4.17
deleted file mode 100644
index 3f98e7e64558..000000000000
--- a/metadata/md5-cache/dev-libs/libzia-4.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:0 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=platform abstraction code for tucnak package
-EAPI=6
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=ftdi
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:0 )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/libzia-4.17.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7c28f27675841b862e05cf4f79b7c577
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index a5f0b97efd59..de6291745a70 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/pysrt-9999 b/metadata/md5-cache/dev-python/pysrt-9999
index c192bcad5b2d..3f332ef88a0f 100644
--- a/metadata/md5-cache/dev-python/pysrt-9999
+++ b/metadata/md5-cache/dev-python/pysrt-9999
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/chardet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=test? ( dev-python/chardet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Python library used to edit or create SubRip files
 EAPI=7
 HOMEPAGE=https://github.com/byroot/pysrt https://pypi.org/project/pysrt/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=dev-python/chardet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/chardet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=aca06cd09f0f0b84d63a746cb8205b06
+_md5_=bc02636438b7a98042837174f8319679
diff --git a/metadata/md5-cache/dev-python/scapy-python3-0.23 b/metadata/md5-cache/dev-python/scapy-python3-0.23
deleted file mode 100644
index 4198b12633a3..000000000000
--- a/metadata/md5-cache/dev-python/scapy-python3-0.23
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !net-analyzer/scapy python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Packet crafting/sending/... PCAP processing tool with python3 compatibility
-EAPI=5
-HOMEPAGE=https://pypi.org/project/scapy-python3/
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/scapy-python3/scapy-python3-0.23.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60e0c1583e87e0449d382f2c58d4141c
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 345d669ed97f..1653f67866bd 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/highline-2.0.3 b/metadata/md5-cache/dev-ruby/highline-2.0.3
index 67fcdad4abfc..9154299a1ad2 100644
--- a/metadata/md5-cache/dev-ruby/highline-2.0.3
+++ b/metadata/md5-cache/dev-ruby/highline-2.0.3
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+BDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=Highline is a high-level command-line IO library for ruby
 EAPI=7
 HOMEPAGE=https://github.com/JEG2/highline
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/JEG2/highline/archive/v2.0.3.tar.gz -> highline-2.0.3.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d14c2ff64b32cbd157b3e48d7cdaaf8f
+_md5_=02e75b4d35551b1c1b92277519e4b1c3
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.1 b/metadata/md5-cache/dev-ruby/timecop-0.9.1
index d389a4239d1d..9b4ee896a71d 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.1
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities
 EAPI=6
 HOMEPAGE=https://github.com/travisjeffery/timecop
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=89c0c1a715e56c43ea69f6fd7a95e6b6
+_md5_=e15aae43c6f2cd3ef6ef6192feb67d43
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index ef1eb3f0a56c..d0923937b6a0 100644
--- a/metadata/md5-cache/dev-tcltk/Manifest.gz
+++ b/metadata/md5-cache/dev-tcltk/Manifest.gz
diff --git a/metadata/md5-cache/dev-tcltk/tkXwin-1.0-r4 b/metadata/md5-cache/dev-tcltk/tkXwin-1.0-r4
deleted file mode 100644
index 739d81172572..000000000000
--- a/metadata/md5-cache/dev-tcltk/tkXwin-1.0-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tk[threads?] x11-libs/libXScrnSaver x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto >=app-portage/elt-patches-20170815
-DESCRIPTION=Tcl/Tk library to detect idle periods of an X session
-EAPI=4
-HOMEPAGE=http://beepcore-tcl.sourceforge.net/
-IUSE=debug static-libs threads
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD
-RDEPEND=dev-lang/tk[threads?] x11-libs/libXScrnSaver x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=http://beepcore-tcl.sourceforge.net/tkXwin-1.0.tgz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a0a4586624a0edaa553acc5860933fb
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index fab569e5f1bd..03f885412498 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1 b/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1
index 200c256f1fbd..ed5f63587cd5 100644
--- a/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1
+++ b/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1
@@ -9,4 +9,4 @@ RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=ftp://ftp.ktug.or.kr/pub/ktug/hlatex/HLaTeX-1.0.1.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-fonts-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-myoungjo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-gothic-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-taza-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-graphic-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-gungseo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-shinmun-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pilgi-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pen-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-bom-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-yetgul-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-jamo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-vada-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pilgia-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-dinaru-1.0.tar.gz
 _eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=79ebbaaec7dba8a1a8bbc822d38b36c2
+_md5_=804790dc4086036b328842f0b60dba7a
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index d236dfc36260..b676e7368fb4 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/ostree-2019.5 b/metadata/md5-cache/dev-util/ostree-2019.5
index bed8db4a9f4b..2e5b0a23d049 100644
--- a/metadata/md5-cache/dev-util/ostree-2019.5
+++ b/metadata/md5-cache/dev-util/ostree-2019.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/glib-utils sys-devel/flex sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
-DEPEND=archive? ( app-arch/libarchive ) app-crypt/gpgme app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup ) dev-libs/libassuan dev-libs/libgpg-error dev-libs/glib:2 dracut? ( sys-kernel/dracut ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) sys-fs/fuse:* sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( dev-util/gtk-doc )
+DEPEND=archive? ( app-arch/libarchive ) app-crypt/gpgme app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup ) dev-libs/libassuan dev-libs/libgpg-error dev-libs/glib:2 dracut? ( sys-kernel/dracut ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:* sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( dev-util/gtk-doc )
 DESCRIPTION=Operating system and container binary deployment and upgrades
 EAPI=7
 HOMEPAGE=https://ostree.readthedocs.io/en/latest/
 IUSE=archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl soup systemd zeroconf
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=archive? ( app-arch/libarchive ) app-crypt/gpgme app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup ) dev-libs/libassuan dev-libs/libgpg-error dev-libs/glib:2 dracut? ( sys-kernel/dracut ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) sys-fs/fuse:* sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
+RDEPEND=archive? ( app-arch/libarchive ) app-crypt/gpgme app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup ) dev-libs/libassuan dev-libs/libgpg-error dev-libs/glib:2 dracut? ( sys-kernel/dracut ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:* sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
 REQUIRED_USE=httpd? ( || ( curl soup ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2019.5/libostree-2019.5.tar.xz -> ostree-2019.5.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1c984ac83807048ce3c055a9b403965b
+_md5_=00d78ee1f335eb967f6bc81f4a23e18d
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 1cac1b110f17..767eaf3d3e69 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 6429a5aa0951..84eced9f1be4 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/xboard-4.9.1 b/metadata/md5-cache/games-board/xboard-4.9.1
index 78277685c2a0..cd22b9de6b7a 100644
--- a/metadata/md5-cache/games-board/xboard-4.9.1
+++ b/metadata/md5-cache/games-board/xboard-4.9.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/xboard/xboard-4.9.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b7a3f358865d6db5aed06354a0412b91
+_md5_=a5555cad54ea55055f2d048811622e51
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 184ced28981c..7e04a0a84092 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 05078abc66ec..8d6cb30bd740 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1 b/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1
index 3d0c7f3b4abb..493859b3fa76 100644
--- a/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1
+++ b/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/edyoung/gnofract4d/archive/bd600c20921afff7b02fc0a76ab79242ebd0896d.tar.gz -> gnofract4d-4.0.1_p1.tar.gz
 _eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2723586e4287a8e0043487b772162871
+_md5_=6fdf8b2bf5fd19dd5273a20af7be3fe3
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 860b11e07a03..ada0482bbf33 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.1.2 b/metadata/md5-cache/media-libs/alsa-lib-1.2.1.2
index f0152d2162fc..9e07732ae6da 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.1.2
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.1.2
@@ -5,11 +5,11 @@ DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
 IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.1.2.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=679a1c86290626677f129a033254de5b
+_md5_=34c8b4a883a071e9295225fe2a532787
diff --git a/metadata/md5-cache/media-libs/libprojectm-9999 b/metadata/md5-cache/media-libs/libprojectm-9999
index 59f626d8c195..41e3a2c37282 100644
--- a/metadata/md5-cache/media-libs/libprojectm-9999
+++ b/metadata/md5-cache/media-libs/libprojectm-9999
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure prepare unpack
+DEFINED_PHASES=configure install prepare unpack
 DEPEND=gles2? ( media-libs/mesa[gles2] ) media-libs/glm media-libs/mesa[X(+)] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtopengl:5 media-sound/pulseaudio ) sdl? ( >=media-libs/libsdl2-2.0.5 ) sys-libs/zlib
 DESCRIPTION=A graphical music visualization plugin similar to milkdrop
 EAPI=7
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=gles2? ( media-libs/mesa[gles2] ) media-libs/glm media-libs/mesa[X(+)] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtopengl:5 media-sound/pulseaudio ) sdl? ( >=media-libs/libsdl2-2.0.5 ) sys-libs/zlib
 SLOT=0/2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=794d96638ef659fa9073f07b7ff4b60b
+_md5_=a98facbd8af1f52d04ab7f904d4c1bff
diff --git a/metadata/md5-cache/media-libs/suil-0.10.0 b/metadata/md5-cache/media-libs/suil-0.10.0
deleted file mode 100644
index 10764e845558..000000000000
--- a/metadata/md5-cache/media-libs/suil-0.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=media-libs/lv2-1.12.0 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) || ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig
-DESCRIPTION=Lightweight C library for loading and wrapping LV2 plugin UIs
-EAPI=6
-HOMEPAGE=http://drobilla.net/software/suil/
-IUSE=doc gtk qt5
-KEYWORDS=amd64 x86
-LICENSE=ISC
-RDEPEND=>=media-libs/lv2-1.12.0 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 )
-SLOT=0
-SRC_URI=http://download.drobilla.net/suil-0.10.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=9c801dff4709644c730c0c87a4ce6880
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 288846627f86..c03ac1170338 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.2.1 b/metadata/md5-cache/media-plugins/alsa-plugins-1.2.1
index 5c3397600335..ef1f35bd367c 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.2.1
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.2.1
@@ -5,10 +5,10 @@ DESCRIPTION=ALSA extra plugins
 EAPI=7
 HOMEPAGE=http://www.alsa-project.org/
 IUSE=arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/alsa-lib-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/plugins/alsa-plugins-1.2.1.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2e5a2c3db2da1079681a14eb1f1ea274
+_md5_=38c29eeb7c7317147bbc293aa3a1d069
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.5
index 2cefc47ce4e4..8e0d22b9e1a8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.5
@@ -4,11 +4,11 @@ DESCRIPTION=Hardware accelerated video decoding through VA-API plugin for GStrea
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi
 IUSE=+drm +egl gles2 +opengl wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm64 x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] drm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/gst-plugins-base-1.14.5:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/gst-plugins-base-1.14.5:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=|| ( drm gles2 opengl wayland X ) gles2? ( egl ) opengl? ( || ( egl X ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.14.5.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0a4e7a2a3229e33090ddcd4c41672479
+_md5_=52e1504b498338b34c0315b2ac03e546
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 84b1dda612a5..9838fec93506 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/tucnak-4.16 b/metadata/md5-cache/media-radio/tucnak-4.16
deleted file mode 100644
index c7da62975e14..000000000000
--- a/metadata/md5-cache/media-radio/tucnak-4.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Amateur Radio VHF Contest Logbook
-EAPI=6
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=alsa fftw gpm hamlib suid
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/tucnak-4.16.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e3f792af679973e0b63c406f2153ee6
diff --git a/metadata/md5-cache/media-radio/tucnak-4.17 b/metadata/md5-cache/media-radio/tucnak-4.17
deleted file mode 100644
index 3da2375b12bd..000000000000
--- a/metadata/md5-cache/media-radio/tucnak-4.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Amateur Radio VHF Contest Logbook
-EAPI=6
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=alsa fftw gpm hamlib suid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/tucnak-4.17.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1283058a08b1bff8116e7242ab03acf0
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 497b2dbea789..060c53401d44 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.2.1 b/metadata/md5-cache/media-sound/alsa-utils-1.2.1
index 8c92bce2f065..a55ed2e06575 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.2.1
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.2.1
@@ -5,10 +5,10 @@ DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
 IUSE=bat doc +libsamplerate +ncurses nls selinux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.2.1 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
 SLOT=0.9
 SRC_URI=https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.1.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=bb0399f560362fd43df990da9ccb01cc
+_md5_=50925eb75507aa03b0d3fdd12d228512
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 1b6fe1a7b29c..ea82ad84b1ac 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/libva-utils-2.4.0 b/metadata/md5-cache/media-video/libva-utils-2.4.0
index c46218fca38a..5e511895ee4d 100644
--- a/metadata/md5-cache/media-video/libva-utils-2.4.0
+++ b/metadata/md5-cache/media-video/libva-utils-2.4.0
@@ -5,7 +5,7 @@ DESCRIPTION=Collection of utilities and tests for VA-API
 EAPI=7
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 IUSE=+drm test wayland X
-KEYWORDS=amd64 arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libva-2.0.0:=[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 )
 REQUIRED_USE=|| ( drm wayland X )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intel/libva-utils/releases/download/2.4.0/libva-utils-2.4.0.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=11aaf6ee3639d8091d7e8fa9afc24d1b
+_md5_=48af9335fc408254b7ac54a7a9b9ee80
diff --git a/metadata/md5-cache/media-video/libva-utils-9999 b/metadata/md5-cache/media-video/libva-utils-9999
index f84288839b9e..be78dbcce953 100644
--- a/metadata/md5-cache/media-video/libva-utils-9999
+++ b/metadata/md5-cache/media-video/libva-utils-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( drm wayland X )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4f569e19847b76cd5b1634d2ee734da7
+_md5_=f691cbd91718165a7699d1d22145c008
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 76028694b237..3f48fc090b6e 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-1.9.3-r1 b/metadata/md5-cache/net-im/telegram-desktop-bin-1.9.3-r1
index c485aa12781a..ef2419753f4f 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-1.9.3-r1
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-1.9.3-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v1.9.3.tar.gz -> tdesktop-1.9.3.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.1.9.3.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.1.9.3.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=246277b50a96ae3fe596d0ccc4443bdb
+_md5_=1a60e9ce7a79022d0141556a53bafb61
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 071674a4a6d8..4f2b05dab12d 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.18.1 b/metadata/md5-cache/net-libs/mbedtls-2.18.1
deleted file mode 100644
index 52f1a8d6eab6..000000000000
--- a/metadata/md5-cache/net-libs/mbedtls-2.18.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl )
-DESCRIPTION=Cryptographic library for embedded systems
-EAPI=7
-HOMEPAGE=https://tls.mbed.org/
-IUSE=cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/13
-SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.18.1.tar.gz https://github.com/ARMmbed/mbed-crypto/archive/mbedcrypto-1.1.0d0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0e850fca749210e387b9c2e915299b38
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.19.1 b/metadata/md5-cache/net-libs/mbedtls-2.19.1
deleted file mode 100644
index 1f8945d8aba7..000000000000
--- a/metadata/md5-cache/net-libs/mbedtls-2.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl )
-DESCRIPTION=Cryptographic library for embedded systems
-EAPI=7
-HOMEPAGE=https://tls.mbed.org/
-IUSE=cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/13
-SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.19.1.tar.gz https://github.com/ARMmbed/mbed-crypto/archive/mbedcrypto-2.0.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d71fd1654ec62cfb2dd0aeff7eee5c0
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index e69c04254235..36f6dd1b0e22 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -1,15 +1,15 @@
 BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=>=dev-libs/libuv-1.34.0:= >=net-dns/c-ares-1.15.0 >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DEPEND=>=dev-libs/libuv-1.34.1:= >=net-dns/c-ares-1.15.0 >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 PROPERTIES=live
-RDEPEND=>=dev-libs/libuv-1.34.0:= >=net-dns/c-ares-1.15.0 >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+RDEPEND=>=dev-libs/libuv-1.34.1:= >=net-dns/c-ares-1.15.0 >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aacb0a0fbd76644e7be4a456585a13a9
+_md5_=3f955360d15d6420e6c63fd8fc63a7ff
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 494e31b5eb4e..3b3791e401ea 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.01.01 b/metadata/md5-cache/net-misc/youtube-dl-2020.01.01
deleted file mode 100644
index e899fd092e39..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.01.01
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://github.com/ytdl-org/youtube-dl/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://youtube-dl.org/downloads/2020.01.01/youtube-dl-2020.01.01.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2d39c2042f64f79a6d35f136680b7b92
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.01.15 b/metadata/md5-cache/net-misc/youtube-dl-2020.01.15
index 4b909ab465ac..30bff91ac8b5 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.01.15
+++ b/metadata/md5-cache/net-misc/youtube-dl-2020.01.15
@@ -5,11 +5,11 @@ DESCRIPTION=Download videos from YouTube.com (and more sites...)
 EAPI=7
 HOMEPAGE=https://github.com/ytdl-org/youtube-dl/
 IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://youtube-dl.org/downloads/2020.01.15/youtube-dl-2020.01.15.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fdf21e8b7a5c0b64c3cd9ff11f2be21d
+_md5_=2d39c2042f64f79a6d35f136680b7b92
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 6bdd8413fd98..17f88255039a 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/squidguard-1.6.0 b/metadata/md5-cache/net-proxy/squidguard-1.6.0
index 9b4502629de7..6321c0ed8f89 100644
--- a/metadata/md5-cache/net-proxy/squidguard-1.6.0
+++ b/metadata/md5-cache/net-proxy/squidguard-1.6.0
@@ -11,4 +11,4 @@ RDEPEND=|| ( sys-libs/db:5.3 sys-libs/db:4.8 ) ldap? ( net-nds/openldap:0 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/squidguard/squidguard_1.6.0.orig.tar.gz -> squidguard-1.6.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=28afa61dd77297e198d72caba1a419fb
+_md5_=bf43844fb81dee4c077e820363d774c2
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 9349690ab05c..8efb87009183 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/celestia-9999 b/metadata/md5-cache/sci-astronomy/celestia-9999
index 1b10a3fa4b48..c524a0befc48 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-9999
+++ b/metadata/md5-cache/sci-astronomy/celestia-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-cpp/eigen virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
+BDEPEND=dev-cpp/eigen virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=>=dev-lang/lua-5.1:* dev-libs/libfmt:= media-libs/glew:0 media-libs/libpng:0= virtual/glu virtual/jpeg:0 virtual/opengl glut? ( media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) theora? ( media-libs/libogg media-libs/libtheora ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=OpenGL 3D space simulator
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/lua-5.1:* dev-libs/libfmt:= media-libs/glew:0 media-libs/libp
 REQUIRED_USE=|| ( glut qt5 )
 SLOT=0
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=751de2f0217324e81669d930ea0b97c3
+_md5_=5a4b5e9631bf835889a60d7805aaedf4
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index a3d3fb2bc683..569e7a87aaa8 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/gazebo-10.1.0 b/metadata/md5-cache/sci-electronics/gazebo-10.1.0
index 22c98ca63e5e..49429afff715 100644
--- a/metadata/md5-cache/sci-electronics/gazebo-10.1.0
+++ b/metadata/md5-cache/sci-electronics/gazebo-10.1.0
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-10.1.0.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36f858c2cad5d5102d08d82d8486df97
+_md5_=976801230bf5a18530393f4686496614
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index dec295e77236..e2208f4ad970 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/libgeodecomp-0.4.0 b/metadata/md5-cache/sci-libs/libgeodecomp-0.4.0
deleted file mode 100644
index ed6e212468ef..000000000000
--- a/metadata/md5-cache/sci-libs/libgeodecomp-0.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.48 doc? ( app-doc/doxygen app-text/texlive media-gfx/graphviz ) hpx? ( sys-cluster/hpx ) <=dev-libs/libflatarray-0.2.0 mpi? ( virtual/mpi ) cuda? ( dev-util/nvidia-cuda-toolkit ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv ) silo? ( sci-libs/silo ) visit? ( sci-visualization/visit ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An auto-parallelizing library to speed up computer simulations
-EAPI=6
-HOMEPAGE=http://www.libgeodecomp.org
-IUSE=doc mpi cuda opencl opencv silo hpx visit
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Boost-1.0
-RDEPEND=>=dev-libs/boost-1.48
-SLOT=0
-SRC_URI=http://www.libgeodecomp.org/archive/libgeodecomp-0.4.0.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=011dc6ea7772e0ee6702fb82d84e956c
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index d6e1cdc1feba..48c4a4d6b9d9 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.4 b/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.4
index 7c0f630a07c4..5c29c2849e1c 100644
--- a/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.4
+++ b/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.4
@@ -3,13 +3,13 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Research management tool for desktop and web
 EAPI=7
 HOMEPAGE=https://www.mendeley.com/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Mendeley-terms
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 dev-qt/qtxml:5 sys-libs/zlib virtual/opengl x11-libs/libX11
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 dev-qt/qtxml:5 sys-libs/zlib virtual/opengl x11-libs/libX11
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=amd64? ( mendeleydesktop-1.19.4-linux-x86_64.tar.bz2 ) x86? ( mendeleydesktop-1.19.4-linux-i486.tar.bz2 ) amd64-linux? ( mendeleydesktop-1.19.4-linux-x86_64.tar.bz2 ) x86-linux? ( mendeleydesktop-1.19.4-linux-i486.tar.bz2 )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71b4cbaf7e95cd75c96de6cdf7003cf1
+_md5_=8db27c167a8c0fbf3ac4b02bf46f9f64
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 330159284efc..52686f11c48e 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/root-6.14.08-r4 b/metadata/md5-cache/sci-physics/root-6.14.08-r4
index 22312fda99b7..a081fc702efd 100644
--- a/metadata/md5-cache/sci-physics/root-6.14.08-r4
+++ b/metadata/md5-cache/sci-physics/root-6.14.08-r4
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=6.14/08
 SRC_URI=https://root.cern/download/root_v6.14.08.source.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=216a7c37477f463f11f966ece0b4f56e
+_md5_=7e086e9930be7db32ae301d91f33126e
diff --git a/metadata/md5-cache/sci-physics/root-6.16.00-r4 b/metadata/md5-cache/sci-physics/root-6.16.00-r4
index 53b548615c81..b8217f9f50af 100644
--- a/metadata/md5-cache/sci-physics/root-6.16.00-r4
+++ b/metadata/md5-cache/sci-physics/root-6.16.00-r4
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=6.16/00
 SRC_URI=https://root.cern/download/root_v6.16.00.source.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1183374eb7aab2022e1b9686d93dcc3a
+_md5_=3fb8e015c826e4cc0e9af238c4b72bdf
diff --git a/metadata/md5-cache/sci-physics/root-6.18.04 b/metadata/md5-cache/sci-physics/root-6.18.04
index 13aec777a520..c1884ff81fa6 100644
--- a/metadata/md5-cache/sci-physics/root-6.18.04
+++ b/metadata/md5-cache/sci-physics/root-6.18.04
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=6.18/04
 SRC_URI=https://root.cern/download/root_v6.18.04.source.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27dc5c9ba16fc023420c9f41091570aa
+_md5_=031460852a6b29d25aa1fb1b048e02b4
diff --git a/metadata/md5-cache/sci-physics/root-9999 b/metadata/md5-cache/sci-physics/root-9999
index da6ff1ac9110..a6d24ac7367d 100644
--- a/metadata/md5-cache/sci-physics/root-9999
+++ b/metadata/md5-cache/sci-physics/root-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !open
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	fortran-2	216ce6fa0e81c0c91667aee598c792dd	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8316d57d59f7b6e7b4c7b29f0927bfdf
+_md5_=c0c00c89eb9bcdf36f451c26f2e48965
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 01c911dec29d..b6a5c25ffae0 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/texinfo-6.3 b/metadata/md5-cache/sys-apps/texinfo-6.3
deleted file mode 100644
index bc4192f0d72b..000000000000
--- a/metadata/md5-cache/sys-apps/texinfo-6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl ) app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19.6 )
-DESCRIPTION=The GNU info program and utilities
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/texinfo/
-IUSE=nls static
-KEYWORDS=ia64
-LICENSE=GPL-3
-RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu/texinfo/texinfo-6.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1779dac8811dbe111a43c3fc528fe5e7
diff --git a/metadata/md5-cache/sys-apps/tuned-2.7.0 b/metadata/md5-cache/sys-apps/tuned-2.7.0
deleted file mode 100644
index f98a81f9d417..000000000000
--- a/metadata/md5-cache/sys-apps/tuned-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/decorator[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/pkgconfig
-DESCRIPTION=Daemon for monitoring and adaptive tuning of system devices
-EAPI=5
-HOMEPAGE=https://fedorahosted.org/tuned/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/decorator[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-apps/dbus sys-power/powertop dev-util/systemtap
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://fedorahosted.org/releases/t/u/tuned/tuned-2.7.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0ae8da6054d9392807469e0fbaf38c33
diff --git a/metadata/md5-cache/sys-apps/tuned-2.7.1-r2 b/metadata/md5-cache/sys-apps/tuned-2.7.1-r2
deleted file mode 100644
index 15d5f2d8ce03..000000000000
--- a/metadata/md5-cache/sys-apps/tuned-2.7.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/decorator[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/pkgconfig
-DESCRIPTION=Daemon for monitoring and adaptive tuning of system devices
-EAPI=5
-HOMEPAGE=https://fedorahosted.org/tuned/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/decorator[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-apps/dbus sys-apps/ethtool sys-power/powertop sys-process/procps dev-util/systemtap
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://fedorahosted.org/releases/t/u/tuned/tuned-2.7.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8d3f98bf1acc5038ea98a03c7e35c226
diff --git a/metadata/md5-cache/sys-apps/tuned-2.7.1-r3 b/metadata/md5-cache/sys-apps/tuned-2.7.1-r3
deleted file mode 100644
index 8b94ef6b37a6..000000000000
--- a/metadata/md5-cache/sys-apps/tuned-2.7.1-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/decorator[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/pkgconfig
-DESCRIPTION=Daemon for monitoring and adaptive tuning of system devices
-EAPI=6
-HOMEPAGE=https://fedorahosted.org/tuned/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/decorator[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-apps/dbus sys-apps/ethtool sys-power/powertop sys-process/procps dev-util/systemtap
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://fedorahosted.org/releases/t/u/tuned/tuned-2.7.1.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4ff14ab2e2428170260ca1b73774f0b1
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index bd0f08713532..a512d109b137 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gettext-0.20.1 b/metadata/md5-cache/sys-devel/gettext-0.20.1
index 42f612964fcd..9744843ca911 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.20.1
+++ b/metadata/md5-cache/sys-devel/gettext-0.20.1
@@ -5,11 +5,11 @@ DESCRIPTION=GNU locale utilities
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gettext/
 IUSE=acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86
 LICENSE=GPL-3+ cxx? ( LGPL-2.1+ )
 PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=virtual/jdk-1.4:= ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.20.1.tar.gz
 _eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a184d5e0cc92c454ea32516805d08e66
+_md5_=140131973f780e023d9ccbe90f9af614
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6-r6 b/metadata/md5-cache/sys-devel/libtool-2.4.6-r6
index 540a95712413..56bc441457c9 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6-r6
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.6-r6
@@ -5,10 +5,10 @@ DESCRIPTION=A shared library tool for developers
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libtool/
 IUSE=vanilla
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69:* >=sys-devel/automake-1.13:* dev-libs/libltdl:0
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=32c37e4f6cdaa4312a80cacf7be4cde3
+_md5_=877f784527cde26d9020bed082138a9f
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index d3189005468f..6797648196cf 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 764614c2ae2a..9c45b3da457a 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -7,9 +7,9 @@ HOMEPAGE=https://zfsonlinux.org/
 IUSE=custom-cflags debug kernel-builtin libressl python +rootfs test-suite static-libs kernel_linux kernel_linux kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 split-usr
 LICENSE=BSD-2 CDDL MIT
 PROPERTIES=live
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) python? ( virtual/python-cffi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) !=sys-apps/grep-2.13* !kernel-builtin? ( ~sys-fs/zfs-kmod-9999 ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 !<sys-kernel/genkernel-3.5.1.1 !<sys-kernel/genkernel-next-67 !<sys-kernel/bliss-initramfs-7.1.0 !<sys-kernel/dracut-044-r1 ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) kernel_linux? ( virtual/modutils )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) python? ( virtual/python-cffi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-9999 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) kernel_linux? ( virtual/modutils )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=134d506872e61233b69a52db219911dc
+_md5_=3a87e410fc60234c75f7d2721d48517b
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index b27b3a913db6..67a326962d21 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -7,8 +7,8 @@ HOMEPAGE=https://zfsonlinux.org/
 IUSE=custom-cflags debug +rootfs kernel_linux kernel_linux kernel_linux
 LICENSE=CDDL debug? ( GPL-2+ )
 PROPERTIES=live
-RDEPEND=!sys-fs/zfs-fuse !sys-kernel/spl kernel_linux? ( virtual/modutils )
+RDEPEND=!sys-kernel/spl kernel_linux? ( virtual/modutils )
 RESTRICT=debug? ( strip ) test
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2f162240197662e538cf3fb338b9140f
+_md5_=f6546b9f11f847cfddf10b72544652d2
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index c21fe33217a1..173be439aa65 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libva-2.6.1 b/metadata/md5-cache/x11-libs/libva-2.6.1
index 522a7e140fcb..f919c5ec219a 100644
--- a/metadata/md5-cache/x11-libs/libva-2.6.1
+++ b/metadata/md5-cache/x11-libs/libva-2.6.1
@@ -5,7 +5,7 @@ DESCRIPTION=Video Acceleration (VA) API for Linux
 EAPI=7
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 IUSE=+drm opengl utils vdpau wayland X video_cards_nvidia video_cards_intel video_cards_i965 video_cards_nouveau abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( media-video/libva-utils )
 RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
 SLOT=0/2
 SRC_URI=https://github.com/intel/libva/releases/download/2.6.1/libva-2.6.1.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=66905957ef8fd6c97715d5deaaa35b54
+_md5_=9e77d147d273b9e7f858718e07c6c107
diff --git a/metadata/md5-cache/x11-libs/libva-9999 b/metadata/md5-cache/x11-libs/libva-9999
index 58badee238c4..daab0955fa41 100644
--- a/metadata/md5-cache/x11-libs/libva-9999
+++ b/metadata/md5-cache/x11-libs/libva-9999
@@ -12,4 +12,4 @@ RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
 SLOT=0/9999
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0ea63e1d936cbe989a1d6e0da3d60d7b
+_md5_=9e77d147d273b9e7f858718e07c6c107
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 2118ce8ca35a..30c4468943b0 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/rofi-1.5.2-r1 b/metadata/md5-cache/x11-misc/rofi-1.5.2-r1
deleted file mode 100644
index be8a690e7ceb..000000000000
--- a/metadata/md5-cache/x11-misc/rofi-1.5.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
-DESCRIPTION=A window switcher, run dialog and dmenu replacement
-EAPI=7
-HOMEPAGE=https://github.com/davatorium/rofi
-IUSE=test windowmode
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/davatorium/rofi/releases/download/1.5.2/rofi-1.5.2.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d98a19ea274ee052f719d5a9e1653f70
diff --git a/metadata/md5-cache/x11-misc/rofi-1.5.3-r1 b/metadata/md5-cache/x11-misc/rofi-1.5.3-r1
deleted file mode 100644
index 3d26a31b969e..000000000000
--- a/metadata/md5-cache/x11-misc/rofi-1.5.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
-DESCRIPTION=A window switcher, run dialog and dmenu replacement
-EAPI=7
-HOMEPAGE=https://github.com/davatorium/rofi
-IUSE=test windowmode
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/davatorium/rofi/releases/download/1.5.3/rofi-1.5.3.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=650ecac83cc574bd0c862d297e2919d8
diff --git a/metadata/md5-cache/x11-misc/rofi-1.5.4-r1 b/metadata/md5-cache/x11-misc/rofi-1.5.4-r1
index 94e7c5cc6035..a1397727214a 100644
--- a/metadata/md5-cache/x11-misc/rofi-1.5.4-r1
+++ b/metadata/md5-cache/x11-misc/rofi-1.5.4-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A window switcher, run dialog and dmenu replacement
 EAPI=7
 HOMEPAGE=https://github.com/davatorium/rofi
 IUSE=test windowmode
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davatorium/rofi/releases/download/1.5.4/rofi-1.5.4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=55ca518b56dca6d5248d706dd37ebbbf
+_md5_=7ff99619acac0f179f63a61abe5b347f
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 284a620306fe..a63cc4a7feed 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/xterm-327 b/metadata/md5-cache/x11-terms/xterm-327
deleted file mode 100644
index b1992991c372..000000000000
--- a/metadata/md5-cache/x11-terms/xterm-327
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Terminal Emulator for X Windows
-EAPI=5
-HOMEPAGE=https://invisible-island.net/xterm/
-IUSE=+openpty toolbar truetype unicode Xaw3d xinerama
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-327.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=536190a57423be95e033e6161a980b28
diff --git a/metadata/md5-cache/x11-terms/xterm-350 b/metadata/md5-cache/x11-terms/xterm-350
deleted file mode 100644
index 21acf5508525..000000000000
--- a/metadata/md5-cache/x11-terms/xterm-350
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig x11-base/xorg-proto
-DEFINED_PHASES=configure install setup
-DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama )
-DESCRIPTION=Terminal Emulator for X Windows
-EAPI=7
-HOMEPAGE=https://invisible-island.net/xterm/
-IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-350.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=807371350f61cd1142433f9c718f3b30
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 22bc582eeb90..e87de0fd4955 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/adwaita-qt-1.1.0 b/metadata/md5-cache/x11-themes/adwaita-qt-1.1.0
deleted file mode 100644
index 2f96bc3324ef..000000000000
--- a/metadata/md5-cache/x11-themes/adwaita-qt-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gnome? ( x11-themes/QGnomePlatform ) dev-qt/qtwidgets:5 dev-qt/qtdbus:5
-DESCRIPTION=A style to bend Qt applications to look like they belong into GNOME Shell
-EAPI=7
-HOMEPAGE=https://github.com/FedoraQt/adwaita-qt
-IUSE=gnome
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=gnome? ( x11-themes/QGnomePlatform ) dev-qt/qtwidgets:5 dev-qt/qtdbus:5
-SLOT=0
-SRC_URI=https://github.com/FedoraQt/adwaita-qt/archive/1.1.0/adwaita-qt-1.1.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	cabe101302b461f32ecbc3767dfb9e23	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6cd530afb3468ee6e2645b0a097bf6db
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 41442d1de66e..10d295e9fbc1 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 12628 BLAKE2B f54d78a9a68c6c94bb6458816d4a4bd268b266bd483299b9360919cfc2cb560d28b98fa46fe8d56d28175d0b6e146d0b9d8801df7d152cd6ec00e3e0ccfe2609 SHA512 b7fe1093beef0591c42f6ee0c553f106e7fc196edbe16c411805bbd20090a4b5a3ae691404357f43954d725ff784b88795fa197a04d399ab550eb913e593921e
-TIMESTAMP 2020-01-21T18:08:59Z
+TIMESTAMP 2020-01-22T17:38:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl4nPjtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl4oiLJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDJQhAAmkx9FKyPID4hRdJA8P2E/rXpquP5idafSYGX5LF61C50ynXbzJ12/Oer
-9n/TkNk5WiDUA9NEfh+RUo0HFnbYv5fcyY3TmP27vJjO1sWu4fCJbNHNrgeL1FsH
-4zlq1l5SdkXzZcHyEAaYsOtdIRaWLqzUDcJByUpHN7wp6d35QhahehV0dSc2UAlo
-rLCxBB8a9KU9fn3uu0xu3UsugipaDXRm8shuJLplkHomnxEw2Zy3exnV8g4NnJ1Y
-tMGp7aumhFEXlNNYpXB+GZ6zssfTTvcWxeHWPFtqEGKiRWfg7y79yEuylE9Hkpcm
-XkZnQR7crJcMiGB9Xy3WK9uc5Pfg143Z7A85JPMPQYK3Ao1Voo998pTr20cMLZu+
-CpBGtKhVWUcFhUM8iW4AQbGDgc59fQWLeyHj9p8TYuiVqikoLpk1BCAv8TvuO7CX
-WbcQu/zFg1KuYlaPzOXKkdtg0uuH/UmG8AE6qC3M+ypKpDmS1jSPolKqahuVhgR4
-ydlzKNm6btLqRILTgvTj3R4KP+XmZmqzjioW+ZTMWYDcdlv+dXo3Q0RaagFUjZHv
-iB28nlU9felJ6Vbpld1127GaxPrs2pRIH7b92nbskuf0u7DFz8MVbpbiIR6I6K2/
-FeXs9CVdmApYn8ptqGj/LZ3qUe6eKNhcZo9D/D9EBFjm9qdD2E4=
-=6DmE
+klDndA/8CD+1s9LepYf4o9tr5TDVne6ho7MrxgSI7zATbS4/5PHa/lvIsKpGKPX/
+4NjE/XwDwjOOBCR8kIakJK64bQVFzQrUm7CwOne9xoYupGdtNouBou5O+PqqlD0K
+n2W5LlX8b71kb48MCBIjjhv7tuXLWUiFtd8SRPqRoHAA/ASm1zZ/ethrp7j8QjGR
+fWyMXfo1LxpNQR3iMJfozkQ0qUzCN8fnRn1bhnV41+6RNIzZU6YeakWKW+C0Un0V
+XQJvmWz0J1nH5RDtmIeLZB9MKQwIPVZZf/hWZulWeXY9xppdxWAEHTESsq7PGd5A
+w2UuowFbFHGnk915vWLTPAmgce41x7Ys52+FC74dCM+GlojduT1yG0M8y7gEbiyM
+hAL1UYRoL21Dp8Yqhxvsn+7If/SLHlIeX+6MN4HLM0OT3bUMxf0poxku3Rr5FMHr
+DvQU1pwqIlRo/DdojGv3G4owsynxp/nvYuqphRycF0wsr7OXs92MALM+hZcEv5Ok
+l/ZeezFdcALK9uzqWAA1aNlsmEE3nDW5Zm5GeIA6Pr+GGQ7JsIGaqQYZKDgjACdt
+uwq1GCj/FqqdP59bF7f+ZXszxA6PMi+t8I0JnNRnpS0HJeEK+FPFcxG/r0TOqzef
+acQ2z9xtGpFQezvvuz+xaQOxdArg0bunWrpkb5wyyjSTDGVem2w=
+=Dqmv
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 70d65a9cc4b4..c10b4dd185b9 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Jan 2020 18:08:56 +0000
+Wed, 22 Jan 2020 17:38:55 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 65671612148a..79e752e3c28a 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -2316,10 +2316,6 @@
       <name>Brian Evans</name>
     </member>
     <member>
-      <email>mjo@gentoo.org</email>
-      <name>Michael Orlitzky</name>
-    </member>
-    <member>
       <email>whissi@gentoo.org</email>
       <name>Thomas Deutschmann</name>
     </member>
diff --git a/metadata/timestamp b/metadata/timestamp
index b58ada0fad15..9cab6d8e82c0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue 21 Jan 2020 06:08:55 PM UTC
+Wed 22 Jan 2020 05:38:55 PM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ed8a60ec4bcb..59c44d0d3475 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Jan 2020 18:15:02 +0000
+Wed, 22 Jan 2020 17:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index c584b90ea837..27a30031b957 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-52188dd478139b08f6ee49ac387a48177e6c66ef 1579627138 2020-01-21T17:18:58+00:00
+b71f33e5cd7dae5760a75ba635d50b099e19aeac 1579713951 2020-01-22T17:25:51+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index a3e6419a8fe9..d37a8121f21c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1579629901 Tue 21 Jan 2020 06:05:01 PM UTC
+1579714501 Wed 22 Jan 2020 05:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e7ccdd5b14ac..c10b4dd185b9 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Jan 2020 18:08:55 +0000
+Wed, 22 Jan 2020 17:38:55 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 7b81b1d76956..82225223b017 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index dd9b600ed057..3be28213839a 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -2,7 +2,6 @@ AUX suricata-5.0.1-conf 2771 BLAKE2B c9f9ac6707f71ace993bcf730df5aab11a6e59fcbb6
 AUX suricata-5.0.1-init 5480 BLAKE2B 48c9484c824f7216d1c4d64394a60b5a5b2c1f5781e8faa775d56765680dd27cb886daf61da7e93f78469f2947f38bd044804acc79f2fb3c40477aff0f470f13 SHA512 6756cebe424b057884904e716af05e74bf2cfc47461a6081b4ff45144d1fefb568ffc3aaffb8162efa3272fea535d0f93632b4778d9c80d64fca26740471ed49
 AUX suricata-5.0.1_configure-no-lz4-automagic.patch 601 BLAKE2B 01874b39d89a8872a35a102018e2e11208549f60790e88f988a689ba09c59fb915bbffccb6db454a8d8d4fee0ccf69b51cd5d2cde11cb6f2a1c401cb74c5c49d SHA512 d26fc7e0193ea3ddd5436964a26bbbfed847890d513c4e7181a0faceb0a688df8ca35ad68045ecd006a25da93d345a942c593f8711f81dff5f63d13e599f78b0
 AUX suricata-5.0.1_default-config.patch 813 BLAKE2B 5758447f2dc6fa50bb6a388c2c83bd35927cf90b66a10e51e5058869e09c05810c037da025a9d26486e33077a06bfe8ba08698618e091bdc40a255d8322062c7 SHA512 0f6337d5bff60cd57f3a3a3edcb82abde9acc6848b158cac1b8f945fc7a228340c420d53a2c5f558d5b5e2b7645f6b104e8105b260245209ba782966d6f04a7c
-AUX suricata-logrotate 161 BLAKE2B d55edb7e36cc27819b6fba26778eff3cc66bfc5c04877e36e27ef9adcf3f003c10cff787b317e00a32a4c764c2180f90c9abd3f81e877d73bd2c892d5ca2d161 SHA512 c22a85667460df9b7b1fd15af1e4472dd5b7d1726a43f3b621547a884dcd64ff49b0728767d6a4dc70c413dd8997905e3753fa94c82cda34e4aaf903ebdb1cec
 AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee3538bd7f0deb9d76bb8552761b4666a3ac80673fe31ffd95424f2ff71e35db0f5fe6667b32478fab4c4 SHA512 4e4e87735731fd0e18ab26e536e7904833a19ce8785ffdd15b22d494673c73044137908feee74800486960f9efd09d1ddc2c75a490a2e35ef06caf23c7439a0c
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
 DIST suricata-5.0.1.tar.gz 23721536 BLAKE2B 529837e8e4d6c33d2093df8208bf03519e0d60deef92eadf9d0a44b7416eae2f900b2f72349815acb86d9bdd9d4253bbc5d7c4c1a34157f544982b0788291624 SHA512 db0797a7992abf0ddf170cb603fdac06b0ff92278bb91343860bccbbe029ea0e83131dfb9805ca44bcbbe3925502119259e350a17e94209b21d1f8b610d965a6
diff --git a/net-analyzer/suricata/files/suricata-logrotate b/net-analyzer/suricata/files/suricata-logrotate
deleted file mode 100644
index 7b22283ec7cf..000000000000
--- a/net-analyzer/suricata/files/suricata-logrotate
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/log/suricata/*.log /var/log/suricata/*.json {
-	rotate 3
-	missingok
-	nocompress
-	create
-	sharedscripts
-	postrotate
-		/etc/init.d/suricata relog
-	endscript
-}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 7aa80cb9581e..5a879cc34826 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index cb5b7547a97d..807d5558993d 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -5,6 +5,6 @@ DIST tsetup.1.9.3.tar.xz 34523816 BLAKE2B af0f3dda8cffdf7db020588f97dbabe5acd56d
 DIST tsetup.1.9.4.tar.xz 34240700 BLAKE2B 665a72d597ed92ba660e091d591e14cb5e6dea72a15fbbcc1dc04c0524f5c55f34373331e1585d18a17360efcca36c62b40f6f7e215b50b3720b1972f25aaa79 SHA512 72b343b27066d49361ef2ce0c5a21e35917a73880afb0010ea4dff7c426b042c5f304a20181720a4bc99d23bc2aabda9091281e64c16c511002df87c43d7b8aa
 DIST tsetup32.1.9.3.tar.xz 37326096 BLAKE2B fe9493878bb29d25bea0c22b8f42864adce4033b5047212595102c7b9f106ee4ea6dca05c3fb88f5f0463ed690a7cff2af07b072ed91d3595a3384ba4fcf6e05 SHA512 5df3ebde72ec93b40e3e0b42625a422c6b31aab88e80ffa02514c2287ff1e6382d37b976d43ae20a4793552d0b699a364278077fa115fb66ea52d080bff9be90
 DIST tsetup32.1.9.4.tar.xz 36939056 BLAKE2B b0077a8faffc7d9035222de8e48f8ac9dab6a09798035b99a00b2aaf76e6a61998b3f035cad993e2ffcdebbafdacb8f9c4ac168cdbd4e4a729a87bd2d575a092 SHA512 191d7b4fde40f8499c4126e87bb442cf71da6c21a994cc0bfaa1ff2d314deece3e42ca92e4427ca66478f35d7067000aef30ecc17d84f187e201d783ee682d32
-EBUILD telegram-desktop-bin-1.9.3-r1.ebuild 1234 BLAKE2B 6f9a8dc423b0e57939927c508a06ef7feeb37ebca9f55edd963357f6d0e04fb397d8d7ac87bb8d4d37ae86eb4a82d4a39a0cb8f8259c51b4497a64b063169e5c SHA512 9440a5854967946022e973754cc8f1f7770e6d4458b3c64d915fe39b1d6919fba4c653026c56ef3169b60b6a0ed23bcd6579486a25224ba0112176199e0dabc7
+EBUILD telegram-desktop-bin-1.9.3-r1.ebuild 1252 BLAKE2B 08e198c00a9b1b9d35ba4736973da5aebfec08e213d3473846942adda2bdc73d32e2f9249512d7a174475294d24e2edccf42871855256f0aa05a98c694bd1079 SHA512 ef7807360bf5c9affb8364d1b8eefeabe86e6f9a2f32fc8c8c620927a832efc420194e8f1193c7b667efb135266bde92bdee2c0f426d4879b797f10767809e63
 EBUILD telegram-desktop-bin-1.9.4.ebuild 1252 BLAKE2B 08e198c00a9b1b9d35ba4736973da5aebfec08e213d3473846942adda2bdc73d32e2f9249512d7a174475294d24e2edccf42871855256f0aa05a98c694bd1079 SHA512 ef7807360bf5c9affb8364d1b8eefeabe86e6f9a2f32fc8c8c620927a832efc420194e8f1193c7b667efb135266bde92bdee2c0f426d4879b797f10767809e63
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.9.3-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.9.3-r1.ebuild
index e3da0c250b31..c0971f7fc9b5 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.9.3-r1.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.9.3-r1.ebuild
@@ -46,5 +46,6 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
 	optfeature "spell checker support" app-text/enchant
 }
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 666312e6d29b..f90058ff722a 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index cf440845db95..8eeb8f4a1a9a 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,15 +1,18 @@
+AUX mbedtls-dont-overwrite-headers.patch 2183 BLAKE2B 1353eb9c929e4d79bc1f4eecd671c9b6602917198724b42e1b43153a4751cd5a36737fd706f97e933beb857a246dc16574f4d989cc674661dd774f7df9d1c3a3 SHA512 19dec50ce70821b0c94e7bd9c50c1f8ebd7d7abc087cb91a637e5349ac938b4b07236f7fc4580e4a348ecb9de68d4b0b45cdced6e5103ce94178be710b2563a3
 DIST mbedcrypto-1.1.0d0.tar.gz 2907562 BLAKE2B 645b8eac1c55e6217d7b309e1b9ddf856f6d565f928e04211bb5714189024bff8f445a8e6c709d6b2e700d9390521cc31d194f4a98f7f211af3ca9b7109d7549 SHA512 923f8b18eaabae56015607442e996d77ddfd68443e3d33176ba9fe1c5a53fe611af584b5d8dc2111fbda41e5396921d6be9a3a3837cd4d85671237e0932f5cc2
 DIST mbedcrypto-2.0.0.tar.gz 3001813 BLAKE2B 35a01b7cb11a94cb5ef333f5939945b40ecd0da482959980931e389ac5aec3c1c1b2f40970bbde4587454aee5957dce220593bfc31943ec3deddfa70d2386a25 SHA512 3a8fa6b7160065ef175139ba9cb4c8599be11f9d0df5fd60f9f96c425400a0a40eaa31d571ce61d4a00e3b10c1e2b81756c1ad31df6fc32777f40ade7806948a
 DIST mbedtls-2.10.0.tar.gz 2190139 BLAKE2B f4e6da0bc433992a79088a86c7bad48564e5d8eca110633960c8197becf1fb64b77e36f2bd63e241ff0a3eb86aae1b6b538de2043e1bb6626b9b18fa9951db91 SHA512 a1dcb46d3e27c93b511a0dc846b5ed6dc35992cdcf04fce6ad83f5a92440d11d60a07e0fec64f9d6c5e2f27365bdd7a557a35af4ff250b342adbde6193240a95
 DIST mbedtls-2.12.0.tar.gz 2299830 BLAKE2B e65da9feaca4dc22e843cb645259ab8c81e24cec709f0f79475b53e3c319f6e5239bd6c82db07562252a35d9746600502c5a856bf6c0de67f2fbbea840b4491c SHA512 c7c2aeb1717886ad87486af2dccb05b2f051372c69fc914f30e4ace1067f5be39ba04e093ad522f904e23a576c1ff430bd772e77823d0f4720f6fc5c1b8aa98c
 DIST mbedtls-2.16.3.tar.gz 2459563 BLAKE2B 5de21b27274dae61e282114da196078be7931e823750f712145c372160204e02f36f995d2cca8589f7b8ffcb646b0b258b0d49db6a0ffa01117b8c0af9f3fa0e SHA512 3d798f7de9c33325585d5d7c8608cc16acdcf42c246d283b2fb8a29f5e419f2899342965ff297432ef2ab20c91eaee28d6ca53349f5a68b0a4fd29d6905fc64c
+DIST mbedtls-2.16.4.tar.gz 2597922 BLAKE2B 787837903e1d9a5951e3b379b17e82bb6857597c55efa913e8a6d9f9be1f26d8c8eb08e72e56855748695771aea2a6e6826b7da7d2ac4d53596584ea967c1457 SHA512 e0546f2233d4ffbf0c0f3227c1ee6185124484a740dbd2d18f02a036567e043c0a8c7b49501ce6fa1b03161d86b487f1cc16f7afafac357d3e5ebfc367cd9a33
 DIST mbedtls-2.17.0.tar.gz 2738368 BLAKE2B efcf2a6c84a85afdca0205bd9e8bcf039074c5e6f40e0814f835cf26c2d13dce87bd140aa0b803eea6a683e31b79680a3ea8ba72417e7ec26f206e0b027b014a SHA512 6ab52d116cb9f755871f2fd196ec1b352dbbe59f2ecedeb5551237e4e672da77205ef0c2f80ec746ba1fd94cab1995ab1729c8adb0f29d10f3c74a67f5327493
 DIST mbedtls-2.18.1.tar.gz 2810688 BLAKE2B 25e8cfdb16e18049e4c89e271babe5b711634099ef89c54169e606da7aabedde1ac862ecd34dbe05e8052ea0183a7aa3b575d431305af4f8ecdd22da0f79f103 SHA512 39d1844806a0312ad97236d247e624fca15f10d7aff2336e764f214594a505f5109d6407fe6d399171086376124bc74da0c0f0b7aa9db85fa41f70143f04b95b
 DIST mbedtls-2.19.1.tar.gz 1165843 BLAKE2B c8e6764b493a6ca011e74d7b297d5ae5140d7bdf17c1cfd5b9d37913d615ad3c5a6dbf71d44cbf14c938646e51bbf04cd63cc1657eb3775addb2dee3ee94c587 SHA512 07ec1cdf98e51ed35bb2940e485d7d8422e9fd440d2077d5cd4c80781d73848228386fe9064773ef8bb1a02c1bc060185b9c8310349d695926bd2c9b7cf6582b
 EBUILD mbedtls-2.10.0.ebuild 2415 BLAKE2B 098c59ee882ce4faa38f1a2a35507cbbb6b99fc9e6460fa6fac8e17e89484caf1e1adb27bfe6e5136900fae27f451c9f036e20579af21cb66412f32c3630907e SHA512 ee2350b912246e028c9b18d7f875a45a4f7c5c56ce64185f2cf8c4267d26ee1dfadfe448285afc03d6b42e948075ab674fe9196463a7b5a6f13505a2ecf4cb90
 EBUILD mbedtls-2.12.0.ebuild 2443 BLAKE2B ba001cc31c56aadad9098f21521b3786644bf613d20b21024b52177e43d7d05c28f59cb423675aad2287104fa68233763876807297fa9a9bee4e00987c3d53cd SHA512 8f8b5d3eb27f70f962732c03e9496af5c513766cdbc68ead3f31720433eb0c28cd49cf809997fcbc46e390d98ee8c9aa11959cf2b679d798b99f313eb45585a7
 EBUILD mbedtls-2.16.3.ebuild 2453 BLAKE2B ec479c9bfd5f505af48b1e4721e8750ff27a2c2688553ee95bfbde387db9e8fe88444ac7a4ac7a4a0c94f655d733889d19aa2d7542615399f87f8fbcd1c4d8ac SHA512 fa0832b7ff8501f8dd9e012d717d8de23a3921d8dc7834884fce5d3b2c8d68b7f144a3c89031fdc6edabeda6b21068803f4b07f8727e09ca5636c21538c3108f
+EBUILD mbedtls-2.16.4.ebuild 2453 BLAKE2B 15cf4dc369f789a3cb945b194c448e5ae85a9b529f38d7453f8b4d117c6a92ca1af7c04740b28c7f291885943250f527720447a439fcdb06b0eff2f763383e3b SHA512 ff4b622b5b2d071ac3f67a44565a6255e4c4d85a254f19e2ec5f2333063f187372b04440af9924fa3e66e55df7540eaf6990c22237932a1f600177faf49de14f
 EBUILD mbedtls-2.17.0.ebuild 2453 BLAKE2B ec479c9bfd5f505af48b1e4721e8750ff27a2c2688553ee95bfbde387db9e8fe88444ac7a4ac7a4a0c94f655d733889d19aa2d7542615399f87f8fbcd1c4d8ac SHA512 fa0832b7ff8501f8dd9e012d717d8de23a3921d8dc7834884fce5d3b2c8d68b7f144a3c89031fdc6edabeda6b21068803f4b07f8727e09ca5636c21538c3108f
-EBUILD mbedtls-2.18.1.ebuild 2682 BLAKE2B 08790193d0653596defe071cd2b7d545e497173cc00569bfa832bb34acf6fa3e58f2ac606d5d6469ae28945d84ef5e3546e7aa344a8e65f6fd4fc9a1a68d8c9b SHA512 cd79f0216a2b2053e5501b1dc79b016a0581a777655ca744118312f5a3021183a08d9c16f64ddc622397f33edb0d12f2c8707acb7e5eee886888e3d077cdb9a4
-EBUILD mbedtls-2.19.1.ebuild 2680 BLAKE2B f397067d4d931d48289e8d072aa194a97d5c9839ce1d55319a2180964a107d2c1b9f360a1e13bec04a9840fc481cbb3ae0f99fbecfaffc07616b1e429859b8ec SHA512 7f598ecc13d221cd073d0456fb637f9d36959f614a5c2bd68cdcf2f71edf5be4a67c0cb74ac96110ccad143dc036a0ca9c8f60c92668a72a29a238a418a27ee7
+EBUILD mbedtls-2.18.1-r1.ebuild 2745 BLAKE2B e8c2e67080ef379c73b76d62fba95d7b0cbaade20e9cd261396c11b7479f0694e49f908aff516cd8d630dec91e79c1a13e9dbca2031ecd08dff98b43285670d4 SHA512 f696f92ed934c3efde4db7f1b0cafd4a8b2a906b3f941c24613691c686529da5aa155c15b2c61ada2d53d93a8fa7e0d2b17218a65d0e017f6542b376382ff1fc
+EBUILD mbedtls-2.19.1-r1.ebuild 2743 BLAKE2B bb89e9cfc6c24c2cb5c0d7b2f0111909ae2b03e1dd1e35f3424f2207b9b417c07c34d212f226a6ea88f4ff36d7f8fe3e417347edaf6aa7a67ca13d630319b5d1 SHA512 a24d05f558eaef41dd2f83b8c3392455bd7759a7ae051a39162a541f27b8d16ee6a00edfd950c1dee31a7974366dc621e317e6999db7defc9f3a0039ac419c98
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.18.1.ebuild b/net-libs/mbedtls/mbedtls-2.18.1.ebuild
deleted file mode 100644
index b94b7770c958..000000000000
--- a/net-libs/mbedtls/mbedtls-2.18.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-CRYPTO_SUBMODULE="mbedcrypto-1.1.0d0"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz
-	https://github.com/ARMmbed/mbed-crypto/archive/${CRYPTO_SUBMODULE}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/13" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	# pretend to be git submodule
-	rmdir "${S}"/crypto
-	mv "${WORKDIR}"/mbed-crypto-${CRYPTO_SUBMODULE} "${S}"/crypto
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.19.1.ebuild b/net-libs/mbedtls/mbedtls-2.19.1.ebuild
deleted file mode 100644
index e7b65760fa85..000000000000
--- a/net-libs/mbedtls/mbedtls-2.19.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-CRYPTO_SUBMODULE="mbedcrypto-2.0.0"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz
-	https://github.com/ARMmbed/mbed-crypto/archive/${CRYPTO_SUBMODULE}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/13" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	# pretend to be git submodule
-	rmdir "${S}"/crypto
-	mv "${WORKDIR}"/mbed-crypto-${CRYPTO_SUBMODULE} "${S}"/crypto
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 1025d0beee41..ef935c7e6a6a 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -6,6 +6,7 @@ DIST node-v10.18.1.tar.xz 21920068 BLAKE2B 9dc0887a33f0888a347628e5bf15eb3687f15
 DIST node-v12.14.0.tar.xz 23244684 BLAKE2B 0e25cbba5e256b139efd45908236f008834afdf01f57a8e84c7e55ba950e56b786cd52eba9a02986eb0e1d38cbf6df38e1cd719d7dcd8085e8c71767adf8155e SHA512 12e887709a54be911c5a81ab7b7be995247b47ebbd2954ca942f9ed8a784ae1a8e4bdb2613e5bb671196f9101d8861cd29e10650a3f0c414db4d096df94b309b
 DIST node-v12.14.1.tar.xz 23258936 BLAKE2B 125289ce3e342c2e5e7bbb6f0b1af109f0ba8fbf2d6630f2cdc4aa31c25a3d846afe773e84daed9824360a6680a2d21378af4fbc42c6337399a143f92850a82f SHA512 2e2b6fa8351b59450ab5491b5e31dc36ce4d9be13c55a14e6e4d95a82cc8334f9fc35261a56a8843903f8021ff333a333bb4d5f24c92b5d7483d4779c3d88342
 DIST node-v13.6.0.tar.xz 32706824 BLAKE2B 69e66354570e057fe215830a2d5bd157e5decfd1e58e4ead4304e0dfcf64e5adfe48503f3bf54afe2cc27df581a0f2ae79e9b730257ceb70c412bd2a47fa5603 SHA512 e7dc8356ac1b167cc32055e209f13cee82c9251440b6a6cc99b26c91f9625e11bd025cfc1c22b6ece95ea178640209a7c8700d678678b3e8bad26080aa2762c6
+DIST node-v13.7.0.tar.xz 32739116 BLAKE2B 2bc4331a059d18f37f41bb472bb19d864366cebae32b6be18d9c14ab91019fbfa6dcb2a8c3c1c256ddd54773d801e852e1820d90bc3b55f3509bfa8e5425121d SHA512 e2a9b0b6c6e038b9c5c55b51531ed30e8767dd492d3c5c50a0de764f7a97f22a3fcb65c4f50adff62219b076e0c688f1320dc87061fbb751a867746e22c60ccf
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
 DIST node-v8.17.0.tar.xz 19013844 BLAKE2B 2f35f61ccc2d67132441dace8b59df6565e5df9e14e6798ab0cb0a024493182881708368248964db30e1213fa7b66301bd73b5146944129d7b14cd2b5b1a9583 SHA512 9f7b0b5695e882b4f727802ad855d398da596f908e64263902781e01f6222a4044be48c104eb76182ddb525dedfc4b28ccd07d64dfa126c462a248d9e8b49fca
 EBUILD nodejs-10.18.0.ebuild 6276 BLAKE2B 24f1dd3c3af4fec3b456f899744b13b0c9451e55a159db5f56f4fe6a4062942798cd94f0b47b01fa933e51ea2fc91482cf2624e04c43dbd53cecc7bdeb573b57 SHA512 f9a3ca0b9eed22383069c2f4de9a0779ce8a0027bd268f1b8ca41d5d2a55e5010ec45c7d3a990ffbec5acc36d81dced37b30d80bf2b0316828eeeec3ce7827d1
@@ -13,7 +14,8 @@ EBUILD nodejs-10.18.1.ebuild 6279 BLAKE2B a620b05278a18edf70fb786e6840238a38b780
 EBUILD nodejs-12.14.0.ebuild 6116 BLAKE2B bcf44cabcf2c5463d1bfb4697212272eec662c41f181b3500ae27aeea17684fc3a5131f6a7e9f3a3a38bf7417c4190f5f3293b691a54899ece793d0c3ff1840e SHA512 6857bd8e8e26e642a133cef54e0df170b6c59a31b46dd68757d6be889c5e360ddbe93f8966eec63d7c91e3cf10a2d71e05b4b07abf001a93380309cdae55dad4
 EBUILD nodejs-12.14.1.ebuild 6119 BLAKE2B 10f8e3c7ef7db2c00fdecc6305bd4928a26a4283613878e8486a18e497c310174033a3f1df31289b6aaa3a2b027f0cbce5568ace197716f9188744fe1a07d773 SHA512 132399c18b562103ac953e2d8fbf6a2045fd9de8902b454774e2d14794ce2818601e09b29bac4abb0fa546108c32d6fa73928375bb78c627cac91468947e1d43
 EBUILD nodejs-13.6.0.ebuild 6140 BLAKE2B 4bad792ead15e0999b02dfe46690cf57ce3fc8fd13f3b6986d26f3046bd22ddbea49eb3a85138a0b0c71d17a8d396dd9e4ff646abd14ef2a62e8c93d95127003 SHA512 8c8a81c2d700105026ba30dd6703aa265554843db7fa9b0673b2641d3a1d6cdb9e1f5904e4dd9558f45ca51a188bc6847cf9bb6f474d92c11e7e2918669db671
+EBUILD nodejs-13.7.0.ebuild 6140 BLAKE2B a4fdc2f755d5c38362f33e622c7a014fd1f8b643cafd940ba76af862511e36987103195d8dc29e40f259fbb3aa76ee6102d5726ffd7134584958734c2fac749c SHA512 a6b075dd8c4b767848227005c743d8b3a0781db476fc7c50a1e106039ec9a219d0ed26f213d15c02e1609d7e3eab256081040206b2f334d905425fd10eaf3887
 EBUILD nodejs-8.12.0.ebuild 6352 BLAKE2B 15a9b98d89d83fb5959b3b2582cea6a430e9dad5ac6033d7ea32647122ed8cf6a093f7dd90abb93f8585c7c1506d2c801bd439651a447b366fbe75a43259fa55 SHA512 df0848a3e96a62d6191ff0dbcf7ce55eb8da34913c39960e8eb02eb2b3c6d6f6d2202e884c77612b93048c85e6079cc95469c17e8357690936ea92eba400ba7c
 EBUILD nodejs-8.17.0.ebuild 6474 BLAKE2B c7748e57d37a828a52127ba285b1b27b472063badf6784fc42616ca5a88a5151bc95162158d34715018db433d8b9e4875f20a7640b1f5b373012d3eb61b5c0eb SHA512 5ca66326a80139455dbe9f2ccb77e588a50142da005c51261f0223b06b4b52d61693f08ce9d22479b8801c5e219a38267e844f3de5a913fad334ebe1dc55cc3c
-EBUILD nodejs-99999999.ebuild 6056 BLAKE2B 2a9d1878477e764d612ff1c11aac1d02f322ad883e9460d9bfc6c546686267329c3abcaf6d912240034e52203b3de0f6ba971de93787472fb6f2632efa37c675 SHA512 1d0c40133c8a2d29cba56c4fffde03fc50f8f495313241923e4cc9043ccec746921ccd235682d3130792fce12318d001186b0630c38dab7e533dbdaefc1f8731
+EBUILD nodejs-99999999.ebuild 6056 BLAKE2B d9858cbc6b73f4e4875451374e14fba3379351bea97e027011325abbb0f3906d9adeb9eb5742bdb4a14bc136c5cf2bc408776f84e3b0a50419a8d4af80afc1a2 SHA512 4b453c14f159c732fbadb0ffdca80048e05c8a86c0fe8fe3854dee7ee5257190cb1050bea735947e5982aef28b81e5ec6ea20724270c4dc72c6d32e68c9e2bb9
 MISC metadata.xml 549 BLAKE2B 89d9231225010c703e933104cc5beea0706d4e865c61c6cb4f95194d2e0b0e4445800eae8c1074c5c313ace3cf3de2a71a05eed880f055b477023dff9729ab2e SHA512 e34ee9c52b2793f6dddb1f82f538598b5085a4bfea37e30047bd3e9bfabce52e3b826b8a2fe8e0e0842a288e14d8f3c229815e287354bdb121ba3e86018303c4
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 8ea61c3c118d..5c9388651ded 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.34.0:=
+	>=dev-libs/libuv-1.34.1:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/nghttp2-1.39.2
 	sys-libs/zlib
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 70a6ef27760a..1e317a21b5ac 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 4c3f6ddec8ec..841f56c12c72 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -8,7 +8,9 @@ AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd
 DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed
 DIST memcached-1.5.19.tar.gz 517380 BLAKE2B 8c6e7c87e786d88c783da87396daec9deb0c9f8c4112fa7cec6d79e8e96505576c2b7f3dff91317a3f45582322cfdb435535a41bb537b0a0bfec9df6f8d5986f SHA512 4445f383e18ffc53071c13b495c3864978658f4f6f439ab4579dd831fc12ad4850e04e9526954608ae627b0b23a9d6cb327560f02d15abff23e12f5d7c1723b4
 DIST memcached-1.5.20.tar.gz 531035 BLAKE2B fcabbb8deac585f20100855bbdd27616077e0f129a8537c39869ceb251fae8d598c64998846120f63f29a690afdc2a3603f87bb21ecc473e13f5ef9e9c48bbb9 SHA512 07b125971fcec2cd06797fe16e9825e18b9d3446f6b91583f82f1b50920cd0e55c65506ebdf5fcef7b08d92f9641a20859ba67b3dd3986ba5624d0d6f494293d
+DIST memcached-1.5.21.tar.gz 532631 BLAKE2B eaed8eae81c7874c48dfc6df5611d83d21a69a19c9b79bddbf909d15f1c84b3c03416002bf0beff07a8e6502741ad6f776e1cc86cf4b16840ea83c727db3c80b SHA512 4ade3e15e6821b76f086b4933f5599248f8de7e7b2ae106dc8ecbc8a5073a1966e4c3956413fd57387bb88fca2c0e95b9a3ce7bfce19c42bec584a3268f06998
 EBUILD memcached-1.5.14.ebuild 2930 BLAKE2B 1e47dcee14202eb3f7de51c779c5e6ddb9eea26fd743a362919fb6bf60e4d2333910b8eb1db13491f429eeb19d9451912e6ec1bdb753ee21eb7f2bdf90415864 SHA512 29986b6567a677dc7b9fb514a03966dc9f661ddfcc5e380118eb4e1b12d06601347149a8e4a97bfbdcbec04f6de243c2fd9201725017c562cb73bc407d79578d
 EBUILD memcached-1.5.19.ebuild 2938 BLAKE2B b67de575ce5c41510d4d0f8c19999e8f6b327460eff5b61192532e682981d27a69142f781e1b6f889b37bb69705fe375e6347d27dedca2c186ea9687dd55b71c SHA512 3989cbe5a174f963dc4daef97add3183f05dc45c2b1a5f1b937ac7d4c700f4ea633ed84697d61a08dfa147568ccde35b77b44cb05cfd95c18ad712ed641999a8
 EBUILD memcached-1.5.20.ebuild 2938 BLAKE2B b67de575ce5c41510d4d0f8c19999e8f6b327460eff5b61192532e682981d27a69142f781e1b6f889b37bb69705fe375e6347d27dedca2c186ea9687dd55b71c SHA512 3989cbe5a174f963dc4daef97add3183f05dc45c2b1a5f1b937ac7d4c700f4ea633ed84697d61a08dfa147568ccde35b77b44cb05cfd95c18ad712ed641999a8
+EBUILD memcached-1.5.21.ebuild 2911 BLAKE2B 17edbe4300536002d2f595ab847351baf0157cae5392031eb6d90546c0e7ac36197e73a2497c709d66d2f3fcc530a1d60e6400dc81aa0e569e65a94c7e067832 SHA512 e129d85539cb635e2387830283c2933d9c076478cc5f6896b18825b24931d332f8c9ea640793e65ebd9753fa55c32fd2a4c3216406c6ad719f097c8fe22783ab
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 61f935071d83..868722cc2870 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-dl-2020.01.01.tar.gz 3156193 BLAKE2B 0052e8da07d83127a8c2cf3a25ab9733e7f4417473e89cdaf849e11e79285e4c8bdce5003b59f6ff8cbf3980043ce2e992346264f08caecebfa4ee33370203b0 SHA512 035d44aa4989067587d3c5a8d1bb4214bb7bfa16b91562c730fcf93de1578de75ddf12c8a0900643578546a4230da776b8b83f69378525c1480e9e0061f492cf
 DIST youtube-dl-2020.01.15.tar.gz 3159264 BLAKE2B 4f7b527e02e5ce6923f66db322c4ba8695e6e2850b7bcf4353914a27c31c7d5d28980b948326585bd2a25b76f4d7e903e8589fe1f137d905aca9ad30d54818d2 SHA512 1b450feef1d6040726f99e482edb6119b66224a98bdec1983f6921f21b08bd8fceb77cff055326b660fb66742815e5e0238807707547ef82b51b9966fdc82be7
-EBUILD youtube-dl-2020.01.01.ebuild 2239 BLAKE2B b0b08d37700f463c53c955d4396dd98eeaaaccd7573b8db735dd7ca52451fa41b0f24344d73b00e78fbb2a86e068373db8bfead32b1ebfca9a38408315a0bc1d SHA512 c82a5b508a3941afaa771dffbd88ca3fdff8fd1af5e1b13a0087790f76911c7cd98ad2f5d45ea1eb257d796ec302d59120197241e9685e9897f590b8af308886
-EBUILD youtube-dl-2020.01.15.ebuild 2245 BLAKE2B c555a3f395758ae90ad46f0db73dd28c9e98d38dfec4de8929edbc0f0f566847725c6ea4c3bec32bc2cb8ee4cda9e0c10c451d19f1cdcf6cf77e57577519b5dd SHA512 57e369eab168d96c31721ab6eb59021b73ef55e5571f5d4029fd9250907061a38f1aaacc0ccce528d0bfa33365f5b53c76400bdde116d8b50733915591de55f2
+EBUILD youtube-dl-2020.01.15.ebuild 2239 BLAKE2B b0b08d37700f463c53c955d4396dd98eeaaaccd7573b8db735dd7ca52451fa41b0f24344d73b00e78fbb2a86e068373db8bfead32b1ebfca9a38408315a0bc1d SHA512 c82a5b508a3941afaa771dffbd88ca3fdff8fd1af5e1b13a0087790f76911c7cd98ad2f5d45ea1eb257d796ec302d59120197241e9685e9897f590b8af308886
 EBUILD youtube-dl-99999999.ebuild 2142 BLAKE2B 1f9fdb555f7f4fb60cfde00f72e037149e9d12458984127dd72c5fb75c27fb6cb4590dc3b81986d8f42d0beee66aed95f5efd5527de21e2b1be6d0065dd5664a SHA512 572c11fd1428ab7ee83a3e6deadf68c378b3ff4f47dca74dcf8604fb4e82e1d8e6f55e64cb1067d011143f212dfff27f923c739834e46f0b226683bfa2c31f87
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2020.01.01.ebuild b/net-misc/youtube-dl/youtube-dl-2020.01.01.ebuild
deleted file mode 100644
index 41719258e92c..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.01.01.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{6,7,8}})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-LICENSE="public-domain"
-
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-IUSE="test"
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-	)
-"
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.01.15.ebuild b/net-misc/youtube-dl/youtube-dl-2020.01.15.ebuild
index faa91ea76c9b..41719258e92c 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.01.15.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.01.15.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
 SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 LICENSE="public-domain"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 SLOT="0"
 IUSE="test"
 RDEPEND="
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index a6d3d8959248..8159a195c05c 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index 358459bc6644..06fda0b535f3 100644
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@@ -6,6 +6,8 @@ AUX shadowsocks.initd 1349 BLAKE2B ec1f4bd395803c6a23ff16c6040ecfe70eae2aa840f05
 AUX shadowsocks.json 132 BLAKE2B 84f0dbdf0a7eb5d1c8d8ca26147b5dde872a78b128357fa4d3d1348afdc4bd3bdd87f73c564d030e9cdc19a0e5fe2d414a5430f2daeddd03c0a24b761460596a SHA512 6bc5c406bdb25123fd43e21784028dd331f729bc56fe7ac4d31e3b1d81d12048a6906db3fd79765a64fc7f8b651095695fd8cdcc60f6d3285231e94a90611cef
 DIST shadowsocks-libev-3.3.2.tar.gz 279477 BLAKE2B 4f40bf3b122f3ccc7da040fdf0d643e2138530e1c5fb295e0bb10d027a2ff525d5ee42febb12ad8fc254d1457e399a9b43904d9c2c9079ca0955c49c3bf808d0 SHA512 2b997680ff46a6888326aea59b554acf81f391663129fe05b75e2bd1474c0c1738292bbab0b5dbbfc2a8228b17759101b1cd266d40b2e7bfdb5912bd3408b3e2
 DIST shadowsocks-libev-3.3.3.tar.gz 279655 BLAKE2B d2d229ae2b3223c987682b6ed3e87481dc2653cbaae0092a7502b7b740a671f805e241e8912a0dbb46741eae0d118acabfc3e08ecc678948d897ba4179e6359c SHA512 f02b43ee95b18b0a63fae1a1ad56b4d5e41cc79dc38cd9ad71c3830b7bb97a14110299f766b1e2cfbd6ce362f4c76c338693b1d8b558cf18b9c5e53a08fddd38
+DIST shadowsocks-libev-3.3.4.tar.gz 279666 BLAKE2B ea698a3cf29ed0b1268d17e25a492712cb90f515068de2f74d200ab04bb0d5ca859ea1d7f071714cc1c8dced0e566df4bfea0d780e24c9398f93ab1e362ec466 SHA512 4fb9e4a62f86f1504aab71022b5078a1f97b1f14da82c7b456dc9eaed23be990430769f37b7c2855c266be40ec215237bb0a40d254dffac8556ec4719cc9aa6d
 EBUILD shadowsocks-libev-3.3.2.ebuild 2234 BLAKE2B 000c464ca58ffdcc13da4940bcc7fc9696b203c3eec9cc832497c4004ef34b63ecde9285a79472124a1b7222edd1f350e96af08336f8f99c789255095536d71c SHA512 f783afe841b842cdd62379eb529fe26b2b947b7623f829535ef995fdf966a08ced6f2fb53d84701ce82d44387275d4897561aaf5530045f9be8e00c05fc80386
 EBUILD shadowsocks-libev-3.3.3.ebuild 2234 BLAKE2B 000c464ca58ffdcc13da4940bcc7fc9696b203c3eec9cc832497c4004ef34b63ecde9285a79472124a1b7222edd1f350e96af08336f8f99c789255095536d71c SHA512 f783afe841b842cdd62379eb529fe26b2b947b7623f829535ef995fdf966a08ced6f2fb53d84701ce82d44387275d4897561aaf5530045f9be8e00c05fc80386
+EBUILD shadowsocks-libev-3.3.4.ebuild 2234 BLAKE2B 8426b1ca82cd215f3df3828b9bd2f06cbdc63db6691aa931e50c40078841ec2c49641eda1d67467614aeab6ef81002a50efe4ac747f41397005259836c8a37bd SHA512 81145f92c80bdeed68871241d695f7376752469e9fd935cb59c216935801b1246988aac868f98631ddf01617c7a4e664c77e8e6f98a8de22ed2f90ca2c565c64
 MISC metadata.xml 334 BLAKE2B 1217232e3b08c238795607fa0281c81feb34ed794005d1e5c1522b3380a9d1f3877ccf787ab88ee95a4cd4db85a11163395e4a3a449d4a862634e5a8cdfbe0e2 SHA512 a1e5349204ad41815cdf8772c760c0e1085749863c71d30fddfa8958d8c6d388575288da4dcd60acdaf00288b5a52a731aa21512a1c7ef9622fd0b2de162086f
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index b8c2681c1e8e..6a80d17b5aef 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -7,5 +7,5 @@ AUX squidguard-1.6.0-gentoo.patch 982 BLAKE2B 9858c7778fbf52573061fd12d3c3941c4f
 DIST squidGuard-1.5-beta.tar.gz 1983030 BLAKE2B 60405e097babb15eb099649d4ffe23a798207c6d3ac490b8c0c7da777a0136fecb867537214aa90c58ff246a86a0cf7ce59b021e29071ecc43ad002f3a0e3def SHA512 37ddc2ac82596e9d24aac6a610763f2eeb7c15b3a2d7babb85948e1da912aebb1dc85309766f7d8c3d7c22713e24a51f4cdef4520117a03d839662ef2494b6e7
 DIST squidguard-1.6.0.tar.gz 1902233 BLAKE2B 36b422fb2424c79532e0d9dc237b4a60b7817190a45de3646a50031b341c5e94540f55adea7b3e8241b8d87fdec551c5c40d1f60ea90e25347305ef9e473b5d3 SHA512 d6e934f550cd777d58abda5f4fd905ccc396afc28e1ddb0bb842a9a3364cbe43db5c30834fe1ed7d93623a361dde50362a79ac2b660382c7e81b4f067f2ac65e
 EBUILD squidguard-1.5_beta-r2.ebuild 2276 BLAKE2B 10cb29c4b29f3bffe7e9c67a2af09c744ee317b0231fac54f0e577554e47b263014ed4b0f620f46a27be7c191d76447603acb1d885279a52871f9b01879101c5 SHA512 fcfce62692dc0d9cac271cca6cf4a344e4c67d1e9bee780fc508ed46f84ed5ff42098ea929f72b7161f57b4f6165d1e9f45f5ed4ee886861d22e3b82c4ac6391
-EBUILD squidguard-1.6.0.ebuild 2219 BLAKE2B 70f53d60a896a53ee9102af862b5334cbaa015a31c219980694472d3e3c1867f731c0ca8b44443a8686d5242f4bc70d955a84a5ceb3571b1e090c7d7a0840809 SHA512 72b9d62aa7901c7bbb78b8f88eda85e52f023813742d7ef7e9ef4beac03f07b3ab398907880d6b2e494d00aeba864b342554b2ad23e0a37cd413702b831f0687
+EBUILD squidguard-1.6.0.ebuild 2252 BLAKE2B 61ccbbe8d0465a99477c93f98f8fa0c6165e8438925c39a80ee28081ae42e178fd72f9ff97b01e43720ebd0a6988943d4da9c7966bf247753e2e19638157d716 SHA512 5496a2a296836d16a4d601e6062bb5bdc3a0be6d38feb1a5613d19ff0f0993890fcf194aae113d8e403120082e7d8459ef5fe43c33642186856a2e0c223fe6f4
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild b/net-proxy/squidguard/squidguard-1.6.0.ebuild
index b826299c3770..30193a1ef08d 100644
--- a/net-proxy/squidguard/squidguard-1.6.0.ebuild
+++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild
@@ -51,9 +51,11 @@ src_prepare() {
 
 	eapply_user
 	eautoreconf
-	# eautomake does not work because of borked source code of squidguard buildsystem
-	# only needed to create install-sh and other missing stuff
-	automake --no-force --add-missing --copy
+
+	# Workaround for missing install-sh, bug #705374
+	local amver=$(best_version sys-devel/automake)
+	amver=$(ver_cut 1-2 "${amver#sys-devel/automake-}")
+	cp -p "${BROOT}/usr/share/automake-${amver}/install-sh" . || die
 }
 
 src_configure() {
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 798cf79022ca..0aead3c08219 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 6d97a08f4cc9..f382fb9baf6c 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-01-21)
+# No stable media-sound/pulseaudio on hppa.
+pulseaudio
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-12-08)
 # sys-auth/elogind is not stable here.
 elogind
diff --git a/profiles/arch/ia64/package.use.stable.mask b/profiles/arch/ia64/package.use.stable.mask
index da1cb4cbcca5..85475d744585 100644
--- a/profiles/arch/ia64/package.use.stable.mask
+++ b/profiles/arch/ia64/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -22,9 +22,8 @@
 dev-util/geany-plugins markdown
 
 # Ulrich Müller <ulm@gentoo.org> (2018-08-09)
-# Needs net-mail/mailutils and net-libs/webkit-gtk which are not
-# stable (yet?), bug #663248
-app-editors/emacs mailutils xwidgets
+# Needs net-libs/webkit-gtk which is not stable, bug #663248
+app-editors/emacs xwidgets
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2018-01-06)
 # Please unmask after newer dietlibc is finally stable on ia64
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index 7c4b0685ce7d..57e2d23a8fba 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-21)
+# works fine on little-endian
+-x11-libs/libva
+-media-video/libva-utils
+-media-plugins/gst-plugins-vaapi
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-08-14)
 # works fine on little-endian
 -x11-drivers/xf86-video-amdgpu
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask
index dfdcbe53b3e4..c4bfb6ecb28a 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-21)
+# mask untested card for libva
+x11-libs/libva video_cards_nouveau
+
 # Robin H. Johnson <robbat2@gentoo.org> (2019-12-06)
 # PPS should work on all arches, but only keyworded on some arches
 >=net-misc/ntp-4.2.6_p3-r1 -parse-clocks
diff --git a/profiles/arch/powerpc/ppc64/64le/use.mask b/profiles/arch/powerpc/ppc64/64le/use.mask
index 6de7d0e140d6..bf0921865fa2 100644
--- a/profiles/arch/powerpc/ppc64/64le/use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org (2020-01-21)
+# works on ppc64le
+-vaapi
+
 # James Le Cuirot <chewi@gentoo.org> (2017-06-29)
 # Remask as this profile is little endian.
 big-endian
diff --git a/profiles/arch/powerpc/ppc64/64le/use.stable.mask b/profiles/arch/powerpc/ppc64/64le/use.stable.mask
index 02d399953398..9675da7ca837 100644
--- a/profiles/arch/powerpc/ppc64/64le/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/64le/use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-21)
+# works, but deps not stable yet
+vaapi
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-08-14)
 # works on ppc64le, but not yet stable
 video_cards_amdgpu
diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask
index 7badf6627937..7e397fafc9cf 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-21)
+# buggy on big-endian
+x11-libs/libva
+media-video/libva-utils
+media-plugins/gst-plugins-vaapi
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-08-14)
 # buggy on big-endian
 x11-drivers/xf86-video-amdgpu
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 81d8a7a4e6d2..1d0ceeb36251 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-12-02)
@@ -31,7 +31,6 @@ app-crypt/mit-krb5 doc test xinetd
 app-crypt/pinentry fltk gnome-keyring
 app-doc/doxygen latex dot
 app-editors/emacs alsa json lcms mailutils
-app-editors/emacs-vcs alsa json lcms mailutils
 app-misc/pax-utils python
 app-text/asciidoc graphviz test
 app-text/po4a test
diff --git a/profiles/features/prefix/package.use.mask b/profiles/features/prefix/package.use.mask
index b54fd4ab047d..d99314be2c6b 100644
--- a/profiles/features/prefix/package.use.mask
+++ b/profiles/features/prefix/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Benda Xu <heroxbd@gentoo.org> (2019-08-20)
@@ -32,7 +32,6 @@ sci-electronics/gtkwave judy
 
 # Christian Faulhammer <fauli@gentoo.org> (2010-01-09)
 # m17n-lib is not available in Prefix
-app-editors/emacs-vcs m17n-lib
 app-editors/emacs m17n-lib
 
 # Jeremy Olexa <darkside@gentoo.org> (2009-09-30)
diff --git a/profiles/package.mask b/profiles/package.mask
index dc87e4f2cc6a..16456f81b130 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,66 @@
 
 #--- END OF EXAMPLES ---
 
+# David Seifert <soap@gentoo.org> (2020-01-21)
+# Upstream disappeared, no other distro still carries this,
+# blocks removal of EOL gtkglext, no revdeps.
+# Removal in 30 days.
+games-strategy/gwp
+
+# David Seifert <soap@gentoo.org> (2020-01-21)
+# Blocks removal of EOL gtkglext, no revdeps.
+# Removal in 30 days.
+games-strategy/ufoai
+
+# David Seifert <soap@gentoo.org> (2020-01-21)
+# Last release over 13 years ago, depends on EOL gtkglext.
+# No revdeps, Removal in 30 days.
+media-sound/glmix
+
+# David Seifert <soap@gentoo.org> (2020-01-21)
+# All released versions depend on EOL gtkglext, no revdeps.
+# Bug #644334, #694834. Removal of releases in 30 days.
+# Lars Wendler <polynomial-c@gemtoo.org> (2020-01-22)
+# Do NOT treeclean the live ebuild!
+<sci-astronomy/celestia-9999
+
+# David Seifert <soap@gentoo.org> (2020-01-21)
+# Last release over 2 years ago, depends on EOL gtkglext.
+# No revdeps, Removal in 30 days.
+sci-chemistry/gabedit
+
+# David Seifert <soap@gentoo.org> (2020-01-21)
+# Last release over 13 years ago, depends on EOL gtkglext, no revdeps.
+# Bug #353119, #435676. Removal in 30 days.
+sci-chemistry/ghemical
+
+# David Seifert <soap@gentoo.org> (2020-01-21)
+# Last release over 18 years ago, depends on EOL gtkglext.
+# No revdeps, Removal in 30 days.
+sci-physics/lightspeed
+
+# David Seifert <soap@gentoo.org> (2020-01-21)
+# Last release over 7 years ago, depends on EOL gtkglext.
+# No revdeps, Removal in 30 days.
+sci-visualization/gfsview
+
+# David Seifert <soap@gentoo.org> (2020-01-21)
+# No sign of py3 port, depends on EOL pygtk and gtkglext.
+# Many open bugs, no revdeps.
+# Bug #443088, #582454, #598682, #623314. Removal in 30 days.
+sci-visualization/gwyddion
+
+# David Seifert <soap@gentoo.org> (2020-01-21)
+# No sign of py3 port, depends on EOL pygtk. No revdeps.
+# Bug #706030. Removal in 30 days.
+app-misc/gourmet
+dev-python/python-poppler
+
+# David Seifert <soap@gentoo.org> (2020-01-21)
+# EAPI 4, last release in 2005, doesn't build, no revdeps.
+# Bug #664498. Removal in 30 days.
+app-text/sary
+
 # Mike Gilbert <floppym@gentoo.org> (2020-01-20)
 # Newer versions are using Go modules, which makes this more difficult to
 # maintain. Take this over if wanted, otherwise I will remove it in 30 days.
@@ -234,11 +294,6 @@ kde-misc/plasma-redshift-control
 # Removal in 10 days.
 dev-util/kdevelop-clang-tidy
 
-# Anthony G. Basile <blueness@gentoo.org> (2020-01-11)
-# Awaiting a fix from upstream, bug #705038
-=net-libs/mbedtls-2.18.1
-=net-libs/mbedtls-2.19.1
-
 # Mart Raudsepp <leio@gentoo.org> (2020-01-11)
 # End of life vala:0.42 series, please depclean.
 # This message shall be kept until 2020-02-11.
@@ -617,11 +672,6 @@ sci-libs/naga
 sci-libs/spooles
 sci-libs/vecmath-objectclub
 
-# Alfredo Tupone <tupone@gentoo.org> (2019-12-20)
-# dev-tcltk/tkXwin functionality is >=dev-lang/tk-8.5
-# Removal in 30 days
-dev-tcltk/tkXwin
-
 # Brian Evans <grknight@gentoo.org> (2019-12-19)
 # PHP 7.1 is end of life and has security issues Bug 703326
 # Associated packages are not ready for new versions tracked in bug 702110
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 6dcf31a0d315..9734241e934f 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 24a2c9753477..25f47f08af53 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -8,5 +8,5 @@ AUX celestia-1.6.1-linking.patch 1526 BLAKE2B 8244fa0dcd7771887c2bd09e5ac2c8abba
 AUX celestia-1.6.99-cfg.patch 781 BLAKE2B 04ff4f7c5159eee81479ed588d302fa6a97475955af733e013fcafb2b37975fb1f2215afe61a715b5ec7716dbd75b5915dd4a5031255adb8fde5f6e64d9b71a5 SHA512 50cce63a701da85b52bee5db5b34eed77118c7c847612b4bc7ae82c80b198c718b4adbf0f21cc82e4afbafe20f53dda191285095d6ee5e796ce7f6c94388b832
 DIST celestia-1.6.1.tar.gz 52600436 BLAKE2B aa5b515a75b0344f6e5d59bf385bf1c368e3c38098a1bb9c273fd87ae34a7c8e88a4bf789935bb35ee16f2037004c8f54e21592023a0675766cb4ce005c704f4 SHA512 5b1221e97ee03f7def317e5e29c5100ebe714a4a3aeb8b9818dc9445e4282b6f87026ab35c7b3d5eb02fa6dbb33693977999d14d9648fc4e6d1947abe32a413f
 EBUILD celestia-1.6.1-r1.ebuild 3062 BLAKE2B b5c913e509ce0706219d93350b5f5657fb9b871fa93604eb493ab496926d5c19bd0afecc448ff1c2bed0fe9098bafd9080a816acdaa5802b25812bd3ff921d3d SHA512 84f0c7f6dc6ec27cf1659178a71b1a936d4d2155530dc51fc457aa08cfe02c89a967f8e169d56d9aa2179265153fe0c998f18e0240255c3dadc5b386f915e6f6
-EBUILD celestia-9999.ebuild 2197 BLAKE2B 2ab8e319eccc65457f8a25416a5b7cbfa58070706a83ae6d436152b6b22bc14703ee442073286f22c79b35e5c4efcdcdfe5d1a6fda1f021eefc7cebae5c35f53 SHA512 d79e69077e9bc5c7c57ec42987611665dfafb78693250da977c7d3e81588a9072c6403977d587f33cdeb216ca2066f63f8a49d30666b1dedd2c09c6c76b57360
+EBUILD celestia-9999.ebuild 2198 BLAKE2B 43dadde15296304e1510e04b528a143e3ee486d7660f596f2405ec0ec09b570a1549a20ae759c4b9b20a65ded40f2b99f354bcf6ec225274f4771b6178438a69 SHA512 333346e88647cf9ec69d135a14509e846f2556c31d3166c826c825ea79f9d98ef7560b876b341bfdf0b1e117eb1c0e1467f1dadfd2bb49d528d093cd73b21098
 MISC metadata.xml 892 BLAKE2B e5bc4a09a9e495bcecf9bc2f5e0c60e7aee0b7c65071ac1636416368a1fc9c49057a23127a964c0cbb9a42c6a679cfed5c8d0511c88c67808f5078cfb3ad04c0 SHA512 f222c4e816f2684d8d8de5d456e81b6f6a9b92f3d3996137ddd371a9934793beeda6d1611e8f510f35eafdbe83837007fbae897efcebd47a6bf00e8b3ae159f9
diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index 60ddc68e30fc..781e1cb43a98 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit desktop flag-o-matic xdg cmake
+
 if [[ "${PV}" = 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/CelestiaProject/Celestia.git"
@@ -10,7 +12,6 @@ else
 	SRC_URI="https://github.com/${PN^}Project/${PN^}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
-inherit desktop flag-o-matic xdg cmake
 
 DESCRIPTION="OpenGL 3D space simulator"
 HOMEPAGE="https://celestia.space"
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index ffd093985cae..b5176a1654cc 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 8ba0dc0edbab..925a7071a732 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,5 +1,6 @@
 AUX oal.patch 653 BLAKE2B 22389b9ac60c471905140e5001f3a43bfeab878633d70e2476242112e55994bde8eea0fc58be39b331b5e9ebacf5f470cb0d1829cab49994bdbfcbf23daf79c3 SHA512 883f752c43b7bf05d23850184130a93667c1e4e98adbaa48da468abce4601cfc42f4c9d8f78a9ff6b1332c1bbdaf5655fa9fbfcc4586420f74097e7d6fd97016
+AUX qtmoc.patch 1176 BLAKE2B d1397e9cd3787c933b43f86d5638971a0806f24496063950fccaad268593eec213e81051cbc035993ac973f3a236941821b2b88e97d6d5d2f366abb3caf8c10d SHA512 35077f09d2e138cfaeec0805a0c6c88b0fb28b863af61283b88002930cf6b26b351d9911d48e9bff253f6e5fce4255fb0cf4426e8a7b459d530dd10c934e9772
 AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
 DIST gazebo-10.1.0.tar.bz2 52723379 BLAKE2B c7902c1797efef80b3110e988e1c01d171f652803a2ac28b880d5a01e2f981655db2d9925263030948d351e95af39d435b8618bf703f56a29033db05f0b29e2f SHA512 8febea84240eeb2367d783b36e4c626145ccf13177837ccb73b6ed87f8b264a337c6f8dc53d8583ce5d903b6152eaa5234ec2015ee292a1681800af2800d9eb7
-EBUILD gazebo-10.1.0.ebuild 1912 BLAKE2B 1d7a244b54c6ae71068773ad11139930b302cd6a04736eb8397d3e1f901b3be51b9c12b7e30d3c0ab8f3a7aee91f284f0e587a8cc2eb794a36569e5134667e2f SHA512 6affc338c6c5d5e635de9f7b1a47a5d728540ab349b1a03aa903656c9a3f14fa34a5e6759ed9fed5b8427468ef94597499dd5aba14b52a8217bb2c128e5f902a
+EBUILD gazebo-10.1.0.ebuild 1938 BLAKE2B 676e35726282ce1cee9c03c68b381caf859eb625614c151f02044b36318f289b76663de2026db99e86f456f5ede626b11522a5d17e2e7183f8e63c298d74b78a SHA512 341dcf3478494be249ff629958e4b66777d8cd24086e79cf269157fe65efa4a874e7c818636bf90a0632b2f7efec27c8c21ddd5d258d29291fe9a94575da3b25
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/gazebo-10.1.0.ebuild b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
index 80c4d00fc21e..7b7aa2a408f5 100644
--- a/sci-electronics/gazebo/gazebo-10.1.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -59,7 +59,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/libxslt )
 "
 CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/oal.patch" )
+PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/oal.patch" "${FILESDIR}/qtmoc.patch" )
 
 src_configure() {
 	# doesnt build without it
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 5f49722fa7b2..1d717e84d3f4 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index 1995a99aaec5..eb825c9ad5be 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1,5 +1,6 @@
+AUX libgeodecomp-0.4.0-lfa.patch 1548 BLAKE2B f5cce98b02e24bcf34ab803ea323351fe56fb382d388b20072b2a3dea5437392601efd39d6a388630f22b8533fb1b5071ed4438a41d1035e58ec9277ffcb542d SHA512 84761ef464e2b69d34718f148571a60edb4d9cb15d920b637b529850a922b284bec0375806e2f021544ccac5ad8645aeee0ee12299866c7179437057cceabdd6
 AUX libgeodecomp-0.4.0-libdir.patch 694 BLAKE2B 87b08665e9f1d236183f7bfaaf34ef5a9839e28f7a94a6b870fe99d19603b11f152227137202be5669c9f9cd2ba65b3f559eba9ca2460676f19c22e0911ab36e SHA512 fa8e0e08b45d9250d6f32e1a8ade6ff8bdb8acb7951115916cee7b6df600800f8aa64cfb92e13bb5b108af98e8ac2b1f127f34b415648ebe556a589bb11af68d
 AUX libgeodecomp-0.4.0-scotch.patch 7962 BLAKE2B e47365810132838ba0afc63dead520a17d866c0c6b5c2c2bf8f7299d688bcf10ef34ff19d1b29a29d3388101f082080b5943b037fdc9aedf937b392ffb46a68a SHA512 78d805aedb820b457ae01e5f35c530edf7de014cc60c640314cefb1cdfa88f54a6128fb56a81e974fed9d0620e56c31a8f97922d78e88d729bbf3c29c71f7f5d
 DIST libgeodecomp-0.4.0.tar.bz2 766090 BLAKE2B 2abc5d10371fbad92f957118cabd656f0b4938d5e102da6446851bd979debddaf5eba8a6321dffd32356a40ca12659d9a7a691929e71989e48a71e5177fedc51 SHA512 3ff1a45844e5879662012cb4bae5d577f30ee71094ed4063b535b0ac3da900f34a1bc25be524c006ff91e0edd665e46cbb6cfc0db7966eebfea30f9fee6eeddb
-EBUILD libgeodecomp-0.4.0.ebuild 1466 BLAKE2B 5d6b2314208bee5bc15bc69fcc564ffa425d82421c1d54df69f8db187adab43889cee89f9d9affcf87ed139d283602c6514491240393bb44444d66f6a273f9b2 SHA512 1fc4b3515cb3d219108da35349292a4bceb1bc282949c2a16127d99a2b75787aa2edc2ac80b712c3b9579686a26e4ffe7a85020345030153c5b67c0420c09a29
+EBUILD libgeodecomp-0.4.0-r1.ebuild 1441 BLAKE2B be37cd45b97af6f32801838593e660d1208329e6a11de35ac59963698178c5610e226a474e0012830450c6271d938594fe001fdcbdcd2d1b807a0da3906f2f38 SHA512 8963789878d586df0f30d6b3067df70d273618f6db70d63db463dcf78de79bc471ebf5ca0463498602a716271db4670219b7b5922cf88ac3058d97f1ad011bb2
 MISC metadata.xml 1201 BLAKE2B e3338a4d2cc26d55bdc820ffde8280507da7b6808ee2f93fd82197e628b2b69d596c48d6bff3c8c4abedc3509588e55db1b238fcfe0cbf2bc751bfffe1f7b6ac SHA512 ebfd83cbb09b16f24ead5192c9d6bf5754e98448c055b05284ccb8a3bf0d90a77215189d5f310b2a44ac2ccc0db998ace007ab658355545e2974dcfe3c07d548
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
deleted file mode 100644
index 14e3f4f3cc83..000000000000
--- a/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils cuda
-
-DESCRIPTION="An auto-parallelizing library to speed up computer simulations"
-HOMEPAGE="http://www.libgeodecomp.org"
-SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc mpi cuda opencl opencv silo hpx visit"
-
-RDEPEND=">=dev-libs/boost-1.48"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		app-text/texlive
-		media-gfx/graphviz
-		)
-	hpx? ( sys-cluster/hpx )
-	<=dev-libs/libflatarray-0.2.0
-	mpi? ( virtual/mpi )
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	opencl? ( virtual/opencl )
-	opencv? ( media-libs/opencv )
-	silo? ( sci-libs/silo )
-	visit? ( sci-visualization/visit )"
-
-S="${WORKDIR}/${P}"
-PATCHES=( "${FILESDIR}/${P}-scotch.patch" "${FILESDIR}/${P}-libdir.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	use cuda && cuda_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MPI=$(usex mpi)
-		-DWITH_CUDA=$(usex cuda)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCV=$(usex opencv)
-		-DWITH_SILO=$(usex silo)
-		-DWITH_SCOTCH=false
-		-DWITH_HPX=$(usex hpx)
-		-DWITH_VISIT=$(usex visit)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_make doc
-}
-
-src_install() {
-	DOCS=( README )
-	use doc && HTML_DOCS=( doc/html/* )
-	cmake-utils_src_install
-}
-
-src_test() {
-	cmake-utils_src_make check
-}
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 3d234712820e..cef30f6bbdbd 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/mendeleydesktop/Manifest b/sci-misc/mendeleydesktop/Manifest
index d75ace5f5f32..afed5bd5fe20 100644
--- a/sci-misc/mendeleydesktop/Manifest
+++ b/sci-misc/mendeleydesktop/Manifest
@@ -3,5 +3,5 @@ AUX mendeleydesktop-1.17.8-qt5plugins.patch 604 BLAKE2B 198f5628b28921018570577b
 AUX mendeleydesktop-1.17.8-unix-distro-build.patch 599 BLAKE2B 8ae42be0372af430d1308836ed4ffe4b6b09c67b64bfe0f76b292e95bf198e698cf9dcd1b284aebbc117111777781fa8a3f007e500b3d61499c10c2da01fc6f6 SHA512 2de6e5ff400871cfbfda3572566ec83db81fcc12aed9f8dc63c5f8a9b32cc4cf985dcfe02d56548351999c94b2d575585ee779547714aae932cf9fb042ace644
 DIST mendeleydesktop-1.19.4-linux-i486.tar.bz2 155476937 BLAKE2B 4f2ae744b46940d55e3d3620d72bd35530f906a117edf89a5e020bd98ae79ac2541ea605855f6fcf79ac9b0ca7340cb298bac65c01c42c4014f994c0da47eec9 SHA512 d70e2e7d29bee69b943f800e971a1e02b3c09c80e25113fc91ed2df158100d77fc46932074bcbd19bd0871676f9e0afa0e0fd20dfa860b3ddce72c89597dbdfd
 DIST mendeleydesktop-1.19.4-linux-x86_64.tar.bz2 159335193 BLAKE2B 583238552309c935ffb36ff2904ae64cf6feae4607b0c1f479fd5744bbdd301181702e51b02220a70cadeaa9f4ae1fc4b63d91b75870fd641cee8b5473becc6f SHA512 b3e6cf2ab2a1584121d57f9400ac363a006828c4077d66781c04ba75af18830ca803074c6517675b8d1f979087b1778ba25435ed549eaa4e38b5684d5ed07f6e
-EBUILD mendeleydesktop-1.19.4.ebuild 2897 BLAKE2B 6690e989bb8bd6b355db82d52547ddfea693e0c59d5a0704c1444c8b53e0e28ebe65aeb795dd62beb88e1e8b53c732a4138ca43839b3e2cbfaf55791a339b8b4 SHA512 02bacca5be484726af2b749645d8c521a23532c88071101be974d0b0eec2e0a35ede6f24ab6e193f521d50fffa25f4868d905d88fd2d40ccaf48f3d6d682ed58
+EBUILD mendeleydesktop-1.19.4.ebuild 2891 BLAKE2B 76b3cf8580bc49085081b7c36bee179e6cd590ce016b68ea4d25062471bbc14a9fb6d9e5a9ab0fc909d03bbded6546e2873b9cf71dd24262083d592891874898 SHA512 72c26b016b96134690a87535f948ecebee305a6de59e800a5b9088c683f0416cd9d151d3d794c250206ed2771c3bc8d92cd84aac48d35a7eb90c789036cfc11d
 MISC metadata.xml 386 BLAKE2B f7b77dcf87b678d7daeb1399a8e3523adbbafcdfa3f775bfa349171b6ac8d4af6dde360a2b6c3281f34a6729d1c146b215c2730f6fb895f60a99b7b75ffddf79 SHA512 34a3638dec2839d2c4fab397b571496793d2a87d8d13229e9b57965dc994ce648cc42a561437e3d0fd09c1c9aa1c9a29987709b3dee3365bec59ae0a435f9463
diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.19.4.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.19.4.ebuild
index 52daa661627a..5daa682e978a 100644
--- a/sci-misc/mendeleydesktop/mendeleydesktop-1.19.4.ebuild
+++ b/sci-misc/mendeleydesktop/mendeleydesktop-1.19.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit desktop python-single-r1 xdg
 
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index fa561cfe4650..23478bdd4620 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 2326b6d8f4b8..418dcc53c936 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -10,8 +10,8 @@ DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff
 DIST root_v6.16.00.source.tar.gz 164836293 BLAKE2B 9d8f02631bdc1fa1775cbdaf50dd1feacd9b3c86b81d679ba6f0ca3c5787cd1d22ef7c33358b608361a01ad4f0aff3e8c749649d24773a35c52ce87f808d08f5 SHA512 17e5b9815973773e30ff83c2f4028e9e93691c1ecb824c162c8b3e02d1f6666fb8e0b72a5d0652a90032af146d92d271cbffcd634fb6fe6a63bdf46d672789bf
 DIST root_v6.18.04.source.tar.gz 165938450 BLAKE2B d6545dfa95817940f2bb6b5b49252eca1958df518a4bc05c4857df60a015a39d0df09ea077465533e6ebc815d04e1742da19d18b7af02b5446f9e73dc92e3c16 SHA512 cfcbdd2db4edf55845a7cd1e6ec0cdf714a7ceacb039fa6fb627d7300d6f849b3b462bab724e33b1d6b08eb22ba42c43b7d64c0c6c47dc8a3bb652f86979f2c6
 EBUILD root-6.12.06-r11.ebuild 7902 BLAKE2B e565b7faa90db1fdedd4a7a92d172a41fd58589d1c573c8dfa904af57be8d4f10ca373d043e04bf2dd54ed49fa8d4c05ce85252f6ce922dcacd1a16d278d257a SHA512 22d29350968a6ecd0b46dec881de811684e81af3519dc48933fccb5bfacf4adfc2ee9b905a9867a25a249a633390199b2ec3d21078ddb59d2ce9d0f39d5ce3c4
-EBUILD root-6.14.08-r4.ebuild 8090 BLAKE2B 0f5f521582dae74a6bf4c519b98e4a8d09e64659a4b958b18447fc9dd7bf199fb5167a78d9591feb73a63e15e7bbeece25040685c34feb1e112fd56a1f24fbed SHA512 00e4be4afacbb431055b6402a5801867370886b2381a5ebdfa73e4d419fc46946d5a28f5d6243648bd4d6ea1ee89de1352e4d334f20411567e36f1cf646e3b9b
-EBUILD root-6.16.00-r4.ebuild 8066 BLAKE2B c118a7fca58c8b3f4d054eaf37d3cdd866ee8fb12e36e05c2c567024a738c33366c448580af7e9350e4f71a3ee80a08490cddbcd0091347e08f8ce5b6e14e411 SHA512 003049600a0553a1af972fcbfe2b9115c87b60b8ab3cf749602b2adbf01b503682279665fb19a345df06dda4068be21e0bc9dcd69740a565186bd06a00b5f159
-EBUILD root-6.18.04.ebuild 7484 BLAKE2B f15aea59f307fea05ebfa23c0e95e4dd0ff96b646cb1453a6a7081a05d1e42218877627a844d4c76c69956a4922246816d45a753fce5e8ed16227549d08e9e24 SHA512 e8e66252d984e80e094d9c2f9830d1a37e5b637048704c28363b423b117b20b98d602fbbd9bbe52fc0153216fc45367fc1478cf36e1593b3b9d602c30b333170
-EBUILD root-9999.ebuild 7460 BLAKE2B 111149045d816ef927b1e662e7d4e76daec172b2e25360087c62cfc137bd2d8bf8495e50a13c17c0306d2777403874f8d8ea90335630f52145fd03a3cf1b953b SHA512 c13e9df7cc2953a82a050fc6fa8e83fd65e239dc37d930e81226e5a7dc5bb54b2333a8c5e2986171232cbb7fa33fc51a9ab6a9813b716cedccd365357f1433b0
+EBUILD root-6.14.08-r4.ebuild 8144 BLAKE2B e70731a73b17b773ecf75226cdf144d654bf97d5be8ce1e5695b1fc3fcb4bbcb7b9e41e912b124c59d53ace0ced036e98cbff013e02e8809ce0cb4e865dafa8b SHA512 cc721eb131f3476bc5db3a3b104aeed51f89520e1a2a49f722ff600034a1b68b6d89aa8320860e7a7b1a030314de0bf3c5931919bea289df9c7d192c9bbc5530
+EBUILD root-6.16.00-r4.ebuild 8120 BLAKE2B fb9c1becf92f3af1f3a1bcd2734e19436a9638fcc4ffa0d150e483dac68755f88235ce3507e6138c66e7e9cd05fde893e231718a670721092d26d1ab22da548f SHA512 0fead6530038e5ec5da30a9ba19ed06c56eca8bed2c75817bfae806eddac3897ea05a8e4467f5868d70dc1c3233a9077f5b30960411de4b2290729c2bd3b0efb
+EBUILD root-6.18.04.ebuild 7538 BLAKE2B 1c7741bd556444952e5cdbb0d5855857d3e35ced5d443d1ecc5efcfa16921d48b712b355495f89d8d0d6f4a100c42922d555f9daa204e1283ede00144cdca905 SHA512 75e3b8788a68827e297293079ec4e0e4057da9fb2d148aeb1315918a18981255e4e0d76650f12da5eb6f41a1afedb0d0e8c89a8a5a92a2130551521384f3efe2
+EBUILD root-9999.ebuild 7514 BLAKE2B d5151116cc0c3674bc34d265e8a0e58dd366ff384ab3d7e9b3cfce98c713ac2bbdbe9152388fc0967bcec8820621fe357a59a516a2ee8aa2133ba6d0a89f575c SHA512 2efaccfee22a23daa9e60814f187c5db64d920285a934ef913da4b77070e97b312760454481cb6319895d4a6a7a0d54d0f5386cf56c592b56801af0808b74bdd
 MISC metadata.xml 3218 BLAKE2B f23175b1a5998bbecdcdb6e5f42d08bd8e16aaeee79f43d30e0906977f389e18a19ddceeba24009360c2f717c29162c8e30b807bda993492f27429802dc62883 SHA512 d3bdc5bce1d1ac904e5a7a9f21bca65deb480ecbd1362a3251c93e09ab07fdcdd6dfd8900e62df3853b7e200880850d9010122500a081fdedb6b43adae25a6bd
diff --git a/sci-physics/root/root-6.14.08-r4.ebuild b/sci-physics/root/root-6.14.08-r4.ebuild
index 5bbe2ef19769..7839ad943f5b 100644
--- a/sci-physics/root/root-6.14.08-r4.ebuild
+++ b/sci-physics/root/root-6.14.08-r4.ebuild
@@ -148,6 +148,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
 		-DCMAKE_INSTALL_LIBDIR="lib"
diff --git a/sci-physics/root/root-6.16.00-r4.ebuild b/sci-physics/root/root-6.16.00-r4.ebuild
index a5cb23b4a646..54a957e14266 100644
--- a/sci-physics/root/root-6.16.00-r4.ebuild
+++ b/sci-physics/root/root-6.16.00-r4.ebuild
@@ -147,6 +147,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
 		-DCMAKE_INSTALL_LIBDIR="lib"
diff --git a/sci-physics/root/root-6.18.04.ebuild b/sci-physics/root/root-6.18.04.ebuild
index ff963889945d..852491a3c7d7 100644
--- a/sci-physics/root/root-6.18.04.ebuild
+++ b/sci-physics/root/root-6.18.04.ebuild
@@ -140,6 +140,7 @@ src_configure() {
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
 		-DCMAKE_INSTALL_LIBDIR="lib"
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 2ced39aaf198..27603b4ccc6f 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -148,6 +148,7 @@ src_configure() {
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
 		-DCMAKE_INSTALL_LIBDIR="lib"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 9379264b3cb0..bc7a736b54c8 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index c1e2466344fc..b3c87446c927 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,7 +1,5 @@
-DIST texinfo-6.3.tar.xz 4468048 BLAKE2B ef255225e1f66dc5e6646761d78dcf3e7ba9c79aa2654dbb527ef10db54b8417af9e1a58a270683956624049c2fb624b29bc2f22763c79bab9858cdcf5e2edce SHA512 ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4
 DIST texinfo-6.6.tar.xz 4946900 BLAKE2B bd33297549d5285d7a4a65041b6025c489c6b436e9591eaf5187ef34f6e869bf7a2a82a00ebe11adc1c4b2904119e9e3f25d2496b5507f91f4b9ba548ba98604 SHA512 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0
 DIST texinfo-6.7.tar.gz 9027808 BLAKE2B ac9a47ae98f27ae55ea1844c74ead6fba256635a56e7a226a1bbdd9ee9ab33565ff8cc7a874410afe6463741285c8fcfd8ff835ae2802009e2d0758405559140 SHA512 a52aaa2f0113c6f14b3cb94fbf7191770017ff6ce2016292770831279cfbb898c2f7f720adee620e08d9d80a9505df89a689ba0c25e92f6579b28b075f7b8ee2
-EBUILD texinfo-6.3.ebuild 1015 BLAKE2B 932996a09337d88a8d8af9c8ad28a3acca061889160e17412c6cf9d80ec3912227f867a4c6a9f6d8737b0514ba19428463a8449c9176251f344d62f38ee7162e SHA512 4406a4e3cb22a074c8e9e6458440893f270c3e1530ac1b278c0bb248b31ca5aec2393c34b366fd0b6f53fa1a640f693bcc93cf3af81e46777c7abc4df41a369e
 EBUILD texinfo-6.6-r1.ebuild 1342 BLAKE2B 7531bbb5ec5a633425dc6e0f92e85c5c8f5fe0b6ab273de97c7aa467cb0519881410443ad800395d131762ff3317d8024760adc29edae7f9e5bd2d10337c1c44 SHA512 2e26da72b0c3d0ea55cd41c4792a7009615cba683dca983625bec2c140e62993e51fa29b925b9e9ac597fd7fc45066a14fc41ef692a8963fd0d32942cfda99ff
 EBUILD texinfo-6.7.ebuild 1676 BLAKE2B 86c012b99896ffe9c3c1394aa6c8220f4bcc1dbb75f366811cc0b9e4adb49fc734ffcf7e1f335b3cf77798502e321662403338b0b442bf8ceb39fc9c7a1d6944 SHA512 c4cb835dc5fd04fce0e47edc9c8e23fa97ca1133d080af29f1dd56c557726f1c6e6eccfa017e9e0349ed82e26c2066cfa36cc0c2a78eb6f1b36db6fb395b2f7c
 MISC metadata.xml 462 BLAKE2B 2e3c58437bda45610f7a2ed95cc8a1ec38c64b256e980816946e02ed6edaf69f20b152a1bda59f8d58f5af6aa7afe1e6dce219a2ba1624aa3f00c36028dfbe4c SHA512 b2015a2dc9e82b7284df86fe013d12f846d19246153526a8b48d1e5124682fd823ad1fb9b6276896b8f4e991efd3daead9e5d02cc43662e6f5be0cf11dbb6260
diff --git a/sys-apps/texinfo/texinfo-6.3.ebuild b/sys-apps/texinfo/texinfo-6.3.ebuild
deleted file mode 100644
index b82534b5d192..000000000000
--- a/sys-apps/texinfo/texinfo-6.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: if your package uses the texi2dvi utility, it must depend on the
-# virtual/texi2dvi package to pull in all the right deps.  The tool is not
-# usable out-of-the-box because it requires the large tex packages.
-
-EAPI="5"
-
-inherit flag-o-matic
-
-DESCRIPTION="The GNU info program and utilities"
-HOMEPAGE="https://www.gnu.org/software/texinfo/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="ia64"
-IUSE="nls static"
-
-RDEPEND="
-	!=app-text/tetex-2*
-	>=sys-libs/ncurses-5.2-r2:0=
-	dev-lang/perl:=
-	dev-perl/libintl-perl
-	dev-perl/Unicode-EastAsianWidth
-	dev-perl/Text-Unidecode
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.19.6 )"
-
-src_configure() {
-	use static && append-ldflags -static
-	econf \
-		--with-external-libintl-perl \
-		--with-external-Unicode-EastAsianWidth \
-		--with-external-Text-Unidecode \
-		$(use_enable nls)
-}
diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index 24265a35b894..d6db825f064f 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -1,12 +1,6 @@
-AUX tuned-2.7.0-upstream.patch 1261 BLAKE2B 71b534a5e170056e1a2301d328377432fdc786c61891bba72c186cf2d8b5f813b1664c91d5bfb9367be114daf26e084172f40d3f201b5ba94f36c1187c8b132f SHA512 f2002184dd1d9b6f40c90ba5d205e66ccae0a546ab20fcf8b76d703ab712f7871d5d0c0bf5ab025dffab861e066a991e0304894c9607fecd4a8102fa3973d8a4
-AUX tuned-2.7.1-makefile-rpm.patch 885 BLAKE2B 383ed2baab24bf0450211dbd016e0e7ca7c3cad28d4bfc6a64e761180bb48dc396e243f5f1bf4dd1a8cf47ef3c9f5cc81d9f436885748818a9b1b68b49cdac02 SHA512 51b8b299c15aa225f4de473150a05acfe2b669c494f4ab364c0e2f278282b7b64945963623cc778c9742d175efa875ca8c1957e50a55536598dd7c9ae8959636
-AUX tuned-2.7.1-sysctl.patch 328 BLAKE2B a86ab64b46196516dae5164d779df2f30cbfd6becdda0aa5d5ba135730a72f129899ba36b2f4c8103035d8a4ab24e58f8cbff9fd5444769b18f92fee870ca94f SHA512 7c6fa6a9425e9955c019ad192476d802cf7870e33ca713f29ec203d157f495f3cf62c9965faddf5db39113285e51e5eb03d72111fab654efc8fbb8d38f08e75c
 AUX tuned.initd 421 BLAKE2B b60d6fbf4110ba7e0b5c36159dc9624460ccb8774f101a50b89e633bb177a8ef9d7c36fa425a27d8c5ec6c7b9b19965212cb5ee4b60e02abb3c3990beb26840a SHA512 0123e60def031887040df8690222cc553d93b3c5eb7413e19f722ef04ccf2aeb6468709f66866d432d4d0b0c0ed6875929f1292fde8ad18c4a6b589d1b40fab4
 DIST tuned-2.10.0.tar.gz 160254 BLAKE2B 0a09b4b870ec153adc62de7811af561ddb3967d459b1d5e8b6f02c5ac036ed170ad3368d18fc1b3fd40649335035cce971a54e1eda8745c77e836a3b2d892a83 SHA512 e0674533f17ac27cd3647808cda1f51d9905f563521af8cb3ffd1854098d6e2ca1adac82e542e6bdf86cce7e659303464eac50b8823167360783a75843d02a60
-DIST tuned-2.7.0.tar.bz2 107541 BLAKE2B b26924a091fd78bbc7e61c8a45b49808d132eb5ebd3fdc00f96be7eaddcffd88183fa59595a29e2c402b2c434bfdb706601d397c2ebca9a5822c6a3416373465 SHA512 ce09dd854e89762fa376f7f63a59feb384940b5dbc5ad74370b33bbda3f060f09e79d2988de3535b072ad749ab7be43ccaaa46a343a9df50eec6c40d7ab85d55
-DIST tuned-2.7.1.tar.bz2 107471 BLAKE2B c9259ee5ce502100edc7c537f6857de3a6af4af0be1773e0c9422c10de16b4a513d514532da26764b0a743f943577d527919f329ff48a012e269fd2a0ac59f10 SHA512 4a4785e3d20ed7f1c2969066676f5fa3d8286b500de1c63169d745e701e1410092d29429d25c13c3515d37ef73dd297945d69db176d693d4152bfbe9ba626833
+DIST tuned-2.13.0.tar.gz 193816 BLAKE2B 1e51a9da855f54db9ac8ed6e764c091d513c1101771422a62c7c501dc3c8741430eb3503803b408709868d16d4791fbedb9dbc088b36fb693f065a1b6054fa15 SHA512 d81b0a80f911fe808ca324319da3e42c3c15196c0c37343d33b45c2b34f33e205e2913d77ffda8598379a91ef72ab73d88d7b83a4684b6a067e3f36d98a85927
 EBUILD tuned-2.10.0.ebuild 1260 BLAKE2B 072a755292b5ce009d10ad07e534f556288e2a3c4e9bf39d92e9848f91c5d075d70ed6837824da7e7cef896f231cf48aeae5128e9c82204e5346ab4b8fc87581 SHA512 cd10e1561b88d5791b234ede308c280bbdcafb67e54314c381bec848f57b94e53f26fff3b3998a0852acfc892725fea94516b83a9ae32769918daa0928b328df
-EBUILD tuned-2.7.0.ebuild 1110 BLAKE2B 52ec7c2aedbf50d9433d535143c98868933e21c99ef4c715b7c76b5e561959061d99252943e911133d970bf0795f0dfb44e0ae40f439174d8c650d9f55f21679 SHA512 f745d80d4c25138f051764fa48af016c76cf9fac770b19b10f8901dcc010040ffaeb7d137e3685e90dbda331cecf48f0cf0abac97a95473f8f0cc0abdae0206e
-EBUILD tuned-2.7.1-r2.ebuild 1109 BLAKE2B 6cff0b820535bc77ee89aa35c3571e1e56b6f0d9424d922d60e56e519053d90128051ee571fad8015073983d2725284ac2931cb0a93a772750fc3f71722eac8c SHA512 4b4ef8ca04d2451bc084fe6654676ea50eb707df880fb3989d88d7728c73f5f2dc38a1d855a28a141eb4cc2d7d6f9e7087c291689504854a6946d8ffdd1ef1cc
-EBUILD tuned-2.7.1-r3.ebuild 1113 BLAKE2B 978491459acfac39947ef6f8ad9d903d92081071b835bfc3539265e636be92406cb3acffafbcbd359a5f2aa88e289f7f4d6737bb304d1c56ba5e7dc8fb1ddd41 SHA512 c38175c8ab81d06d65c9d61ea3d3cd3586da8c846a2d589fc56fbc0470b40587adb3ba98db53f0d142d5252b41e225655c186a03de96ed4377029e09d45cdcd8
+EBUILD tuned-2.13.0.ebuild 1257 BLAKE2B 493f557310decdce8074fb5ef178d0225c422c0bdaf97e862fda9c098a3cf56cebfac65602eccac2a0c97aa3322f5b66ad104c4a0473a92a8cefd07c2e5bc69b SHA512 cd9828ce3304579c10628be032603d0cd41dc75ebe4b929c77d0193d1c2286244939a199d278bf38de1b1f763f28abcc630a5d83d7c0c3d989314a87a7d2d9f6
 MISC metadata.xml 388 BLAKE2B fba6c8b1e8afb1e474dca668ef0f1d9adc633f9c382ce7772235a8a38c1530dcb9329730d9b1c912a7b44a48ef43572f046751f51c3efcce3f4a6c7c2cdc012e SHA512 6f25c8d915777f95c6f134ba77006290b2d4c02ba70c7254ce7225062da042d8c9f7eb312f842a2988866804ff5069f5f3871e54f97d23bfac936da994d456ea
diff --git a/sys-apps/tuned/files/tuned-2.7.0-upstream.patch b/sys-apps/tuned/files/tuned-2.7.0-upstream.patch
deleted file mode 100644
index f864433b1941..000000000000
--- a/sys-apps/tuned/files/tuned-2.7.0-upstream.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/tuned-gui.py b/tuned-gui.py
-index 0555404..b169dec 100755
---- a/tuned-gui.py
-+++ b/tuned-gui.py
-@@ -89,7 +89,7 @@ class Base(object):
- 		try:
- 			self.controller = \
- 				tuned.admin.DBusController(consts.DBUS_BUS,
--					consts.DBUS_OBJECT, consts.DBUS_INTERFACE)
-+					consts.DBUS_INTERFACE, consts.DBUS_OBJECT)
- 			self.controller.is_running()
- 		except tuned.admin.exceptions.TunedAdminDBusException, ex:
- 			response = self.tuned_daemon_exception_dialog.run()
-diff --git a/tuned.spec b/tuned.spec
-index 3a2dcec..1b46daf 100644
---- a/tuned.spec
-+++ b/tuned.spec
-@@ -334,8 +334,6 @@ fi
- %changelog
- * Tue Jul 19 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.7.0-1
- - new-release
--  - rebase tuned to latest upstream
--    resolves: rhbz#1289048
-   - gui: fixed save profile
-     resolves: rhbz#1242491
-   - tuned-adm: added --ignore-missing parameter
-diff --git a/tuned/admin/admin.py b/tuned/admin/admin.py
-index ad501c0..cbdd1be 100644
---- a/tuned/admin/admin.py
-+++ b/tuned/admin/admin.py
-@@ -98,7 +98,7 @@ class Admin(object):
- 
- 	def _action_list(self):
- 		self._print_profiles(self._profiles_locator.get_known_names_summary())
--		self._action_dbus_active()
-+		self._action_active()
- 		return True
- 
- 	def _dbus_get_active_profile(self):
diff --git a/sys-apps/tuned/files/tuned-2.7.1-makefile-rpm.patch b/sys-apps/tuned/files/tuned-2.7.1-makefile-rpm.patch
deleted file mode 100644
index 408ef2b73c3a..000000000000
--- a/sys-apps/tuned/files/tuned-2.7.1-makefile-rpm.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/Makefile b/Makefile
-index df2a139..6200cae 100644
---- a/Makefile
-+++ b/Makefile
-@@ -19,8 +19,12 @@ else
- 	GIT_PSUFFIX = .$(GIT_SUFFIX)
- 	RPM_VERSION = $(NAME)-$(VERSION)-1$(GIT_PSUFFIX)
- endif
--UNITDIR = $(shell rpm --eval '%{_unitdir}' 2>/dev/null || echo /usr/lib/systemd/system)
--TMPFILESDIR = $(shell rpm --eval '%{_tmpfilesdir}' 2>/dev/null || echo /usr/lib/tmpfiles.d)
-+UNITDIR_FALLBACK = /usr/lib/systemd/system
-+UNITDIR_DETECT = $(shell rpm --eval '%{_unitdir}' 2>/dev/null || echo $(UNITDIR_FALLBACK))
-+UNITDIR = $(UNITDIR_DETECT:%{_unitdir}=$(UNITDIR_FALLBACK))
-+TMPFILESDIR_FALLBACK = /usr/lib/tmpfiles.d
-+TMPFILESDIR_DETECT = $(shell rpm --eval '%{_tmpfilesdir}' 2>/dev/null || echo $(TMPFILESDIR_FALLBACK))
-+TMPFILESDIR = $(TMPFILESDIR_DETECT:%{_tmpfilesdir}=$(TMPFILESDIR_FALLBACK))
- VERSIONED_NAME = $(NAME)-$(VERSION)$(GIT_PSUFFIX)
- 
- DATADIR = /usr/share
diff --git a/sys-apps/tuned/files/tuned-2.7.1-sysctl.patch b/sys-apps/tuned/files/tuned-2.7.1-sysctl.patch
deleted file mode 100644
index 8e2a70fc377d..000000000000
--- a/sys-apps/tuned/files/tuned-2.7.1-sysctl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tuned/plugins/plugin_sysctl.py
-+++ b/tuned/plugins/plugin_sysctl.py
-@@ -67,7 +67,7 @@
- 			self._write_sysctl(option, value)
- 
- 	def _execute_sysctl(self, arguments):
--		execute = ["/sbin/sysctl"] + arguments
-+		execute = ["sysctl"] + arguments
- 		log.debug("executing %s" % execute)
- 		return self._cmd.execute(execute)
- 
diff --git a/sys-apps/tuned/tuned-2.7.0.ebuild b/sys-apps/tuned/tuned-2.7.0.ebuild
deleted file mode 100644
index 94d7224a94c2..000000000000
--- a/sys-apps/tuned/tuned-2.7.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 systemd
-
-DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
-HOMEPAGE="https://fedorahosted.org/tuned/"
-SRC_URI="https://fedorahosted.org/releases/t/u/tuned/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/dbus
-	sys-power/powertop
-	dev-util/systemtap
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-upstream.patch
-
-	sed -i \
-		-e "/^UNITDIR = /s:\$(shell rpm --eval '%{_unitdir}'):$(systemd_get_unitdir):" \
-		-e "/\$(DESTDIR)\/run\/tuned/d" \
-		Makefile ||die
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/tuned.initd  tuned
-
-	python_fix_shebang "${ED}"
-}
diff --git a/sys-apps/tuned/tuned-2.7.1-r2.ebuild b/sys-apps/tuned/tuned-2.7.1-r2.ebuild
deleted file mode 100644
index be0e99e3ef44..000000000000
--- a/sys-apps/tuned/tuned-2.7.1-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 systemd
-
-DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
-HOMEPAGE="https://fedorahosted.org/tuned/"
-SRC_URI="https://fedorahosted.org/releases/t/u/tuned/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/dbus
-	sys-apps/ethtool
-	sys-power/powertop
-	sys-process/procps
-	dev-util/systemtap
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysctl.patch
-	epatch "${FILESDIR}"/${P}-makefile-rpm.patch
-
-	sed -i \
-		-e "/\$(DESTDIR)\/run\/tuned/d" \
-		Makefile ||die
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/tuned.initd  tuned
-
-	python_fix_shebang "${ED}"
-}
diff --git a/sys-apps/tuned/tuned-2.7.1-r3.ebuild b/sys-apps/tuned/tuned-2.7.1-r3.ebuild
deleted file mode 100644
index 99c6ce5840b7..000000000000
--- a/sys-apps/tuned/tuned-2.7.1-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 systemd
-
-DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
-HOMEPAGE="https://fedorahosted.org/tuned/"
-SRC_URI="https://fedorahosted.org/releases/t/u/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	sys-apps/dbus
-	sys-apps/ethtool
-	sys-power/powertop
-	sys-process/procps
-	dev-util/systemtap"
-
-PATCHES=(
-	"${FILESDIR}/${P}-sysctl.patch"
-	"${FILESDIR}/${P}-makefile-rpm.patch"
-)
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/\$(DESTDIR)\/run\/tuned/d" \
-		Makefile || die
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	python_fix_shebang "${ED}"
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index e84829bf8a22..f015f45fc466 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 043d0d31dc48..6103ebc51114 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -7,6 +7,6 @@ DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dc
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
 DIST gettext-0.21-rc1.tar.bz2 16947151 BLAKE2B 9bd846afdbe0b5cb82ce7d3b962fdaf6282be000d692d1109ffb7197fc081442f42b83f8c9332c430f2ce9676e15faba180c4ebfde81bc76545480830bf2fd80 SHA512 f8236062456e823f7e14b2bc9fbaaa82c7772605e3624e0114f6fc5a122c935ac5bf7015d35df694f69de8127b6f17a2862a3761a2a97dc3b4c19b768dbbc909
 EBUILD gettext-0.19.8.1.ebuild 3943 BLAKE2B a47b7da091c324ba47f8311b637f4d8e5b011240ce096b904d7e98523a86f80510efd85e6cd03b2b427af4a99d28710edcb1cbd76f90302c831630438912da19 SHA512 d7a1e4971a092f428a0b4f92f13f3e30a52030af45ade53161c99cad8b8217ab49e96ddd027b6ee6d68935c39787f1fc8d9969116fdc64973526d5c22fd79a79
-EBUILD gettext-0.20.1.ebuild 4057 BLAKE2B 64ed892726312b1a3fd152bc93e16cb0f38866d1e818f01545a0139ad9ab1080d70cca7f2c3dc6fe9ca7c6603e92751a0c41be45413217376bdac9bf3c9082aa SHA512 2940dd98c38a57d9050f758e997394095313bcd72baaa6a11a8cefd6902d287385a0e4c3158e795e092e601f4ebf3789523aa2a11d07eea734a281a13d0989e5
+EBUILD gettext-0.20.1.ebuild 4052 BLAKE2B 747f6257773f23d4eab40735ead1976e7a9af9516076e935b06f9e34009f68d5e085c395adaf67fede4144691c764c86abb3c66372cd28fa70e58ba44260717b SHA512 911945d06bcc82f00f2b678e71759c869c9ebb738f34d5e915e73be017345845dc0acfbbf02b9030e77679dd94351317a0ede74bb8f98dd47111430eb6030c11
 EBUILD gettext-0.21_rc1.ebuild 4188 BLAKE2B 8b891dc26e504e0cdb74f2237177413c2f728c8b7e31a0cc1000d0cc31409389bec4c3dff99e1660412becda2347c0c2ff88f3df2a556da47e754fed6aab63ed SHA512 a9bce110ab72e3115b4506b505e530470aa9e9fda7d0dba47d36061d3e3fe9374ad74326512a8d0d4fcdd7ad5997bfff2fa60f9a11af567d32f3f7c5cd5f8edc
 MISC metadata.xml 630 BLAKE2B 4e89248161acde4bca6252961fdf9227a08c528cfb91c7c06f85e4573bac6d0c3c7543ddd582b36cfbaedb7acf5139216e4518af4f7f310b1a9a1fd5b960fa5d SHA512 2eac2c110dde44856c6b45a3a1f5d58e26b887041fe8250c17ee6ca555240204296592a25122cf7595551b83b6414a4890a0886458dc4ff4e9135e2bbfc86507
diff --git a/sys-devel/gettext/gettext-0.20.1.ebuild b/sys-devel/gettext/gettext-0.20.1.ebuild
index 97dfeb761e14..8bea4b979fc0 100644
--- a/sys-devel/gettext/gettext-0.20.1.ebuild
+++ b/sys-devel/gettext/gettext-0.20.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 # so put that license behind USE=cxx.
 LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
 
 # only runtime goes multilib
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index a1739e463c0e..415897c8c18a 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -14,6 +14,6 @@ AUX libtool-2.4.6-pthread_bootstrapped.patch 532 BLAKE2B aeb1592c07a9c5eeed81c48
 AUX libtool-2.4.6-sed-quote-speedup.patch 7619 BLAKE2B 14e0341bb5b5878dd9bab5996a63d849c5d8c257618a87792bf7c904481d07430553102da2917cb518c37790d2321ae6202572ab59614a8291e475fc8a043ee6 SHA512 f5658f87edc24e494fff1ad2b1932dcd4a8a1515e88a10f3d5bc076ac69570e11c4559a8a56d577dc24181de262c97d6c1cfb16b9cd8315264cf55bc1351bf71
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
 EBUILD libtool-2.4.6-r3.ebuild 2564 BLAKE2B 3eaae24785c03a7ad35a5e6ab7d06b5ab553b9fa1e3065aa8b4b8f75b98f76e0449d55f778e9b56a73e988014af2c0c0e9af9dbe7a47efc54ef4cd5d7181858a SHA512 eeba50e6d2bfdf056ba88fda462e8658acd7373d4cb2902470aa57356aad91294ab60b70db4a834de51b6b4346cf7929a3246939af7ce9e4efcbe6324ba87caa
-EBUILD libtool-2.4.6-r6.ebuild 3588 BLAKE2B 25f132ef44d13bd692ad211fbba409834d58b83c50fff968f791b32eade6dfc7625e7a42579de05e280c53835b68f1d02214f0904cc8a62ea4c3b2fe2f0cdf5c SHA512 df438e3e814fbfe155598cbca63a2bc76a496129fea437f454bc1523d05ac751e0ebacde766359755eca026bb5f0c5d10528f5ae180681c050b0323c9567aeac
+EBUILD libtool-2.4.6-r6.ebuild 3583 BLAKE2B 84848878036290a5e51be69d5aede07f58069618c8ae3b563dbede35872bfea22d1d076644178fba08b8acf5afef0a731af749e6d897543ce183809356f3cb6b SHA512 c4e2a42524beaac9b2744be52990e51702ace31ff5096e359ff16cacbcd48be7637773b76349d270ce29abfee7e381541137cbb29f915e60dd1f37dcdf9b7de7
 EBUILD libtool-9999.ebuild 3236 BLAKE2B 2f47c0b3326d3f88b70591d3b23c5c8eeecb2b974e04b8ee08528e28fa83f9b3cae0ace76b94d53b21309f45003b5b730c21636e1a8ced3db8b2db183a7b6e1f SHA512 eb064c77276e9c912c667ef075779c5a0423270ba6cf0b11e39fccb4dadea7910d18437e12b72604b6c82ee0238a667f6e81842eab0dc0734d26a44519f2572b
 MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/sys-devel/libtool/libtool-2.4.6-r6.ebuild b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
index 1ad9617e613d..d6c57a67a5a0 100644
--- a/sys-devel/libtool/libtool-2.4.6-r6.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 82fd06325d91..b96ee0d211e5 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 2d9a299b5187..3f2315c84dda 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -3,5 +3,5 @@ DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d
 DIST zfs-0.8.2.tar.gz 8738111 BLAKE2B 5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0 SHA512 1424b1a030b814f812b5da422100669db5b8c3ccae14c2fdd62a5e0df28e7255247fe5ca99c95a14f08c92cc1574c22dd132093e4a1dd81e38c95b10cc5e2496
 EBUILD zfs-kmod-0.7.13.ebuild 4119 BLAKE2B f8d921251bc94644a7331762054935518bb9fb68425b404572876466bff118b9ae20cf297f34d9267c933d7ea28840c84fe8e4a867e9a9f191b627f29207798b SHA512 8e4eb43e5b4edd7dcb8b0ecb13a809340ee20247017e7cb141b8489dc4c9988b84b40e866028e8d3b73aea69981a923e4fc4b237389115fb8e72d8b6ed450340
 EBUILD zfs-kmod-0.8.2-r2.ebuild 4483 BLAKE2B 6fed0585a7ef9c6d22b0787e7da013cba40c7121ab79eca2ac85b56005bfd34d80d1f635d4c052c7e4f63e19c247ed6d81b77a83bef7ecf5f2bb943c1b431fbe SHA512 946f096ea68965171b55806c1274dfa3935de4850966a8b6a5acd6ea385ca442daab89623697c7a687e41f8a7716622f0c3b234f93921dd7b25cbea22cc6f7d0
-EBUILD zfs-kmod-9999.ebuild 4424 BLAKE2B 06e992b94cb387e0d133dd01fda648bfd1a0b22079d09749befee7cb4c58024943b4bca325100c74097f204706620e6ac0028cae5bb0ce8ecdb5e1812d792a8f SHA512 76e34d95098a8df75d01b150a39c1a00178434a9fc4998719bca4ce8b480b43dece50a65d239238f875f7e19c7a7e5e47d3e3b6ff9cd155ad5aba626973c6408
+EBUILD zfs-kmod-9999.ebuild 4406 BLAKE2B 95bfd099332c55d3b2da8a3c5f5a0e5f88ad9ca7e09472001421f1eb6c13a5ff812e1b4167e9b74c2ca2900d3442d0e31aaf3ec0afd81bb258cd48ed6b0af616 SHA512 c21d08e82751bc83a2c0662aa6caf23621775fbb10539e9fe31fd794279248ad5e2888b67c247efbd0bb453a14ca9bf1085e2896efe0b1af7ae98491f10ce5d8
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 6bced727e3b9..e8dbe7749786 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,6 @@ IUSE="custom-cflags debug +rootfs"
 DEPEND=""
 
 RDEPEND="${DEPEND}
-	!sys-fs/zfs-fuse
 	!sys-kernel/spl
 "
 
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 15873bfd05b7..5b552e3f245c 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -9,5 +9,5 @@ DIST zfs-0.8.2.tar.gz 8738111 BLAKE2B 5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e
 EBUILD zfs-0.7.13-r1.ebuild 6282 BLAKE2B 9fae8590e1d6f723bea164f90b6b8a5ce1a96d8dc2d10b514f0d50a2c24c70ede7fd3dc1888efc4c3746e72d4970d5c2ed501072a21f08a46a188cd288a9743b SHA512 b50d3835a65153143ea4b9236e8084a495565397d570b64f4b622e4b501432a55b8b604dc7f276502e97e0b500302b74ae53fc8ba12c087f9e43ba84a4891ceb
 EBUILD zfs-0.7.13-r2.ebuild 6346 BLAKE2B f317a17063a320a92c13b1546507dc37b75c48ae5c19871d8ed0113590dd84687bd5b331f168a5d68e8d0aef0c135519e5abd9a8c91c858ab6bae53c5236496b SHA512 4c24e183caf67d52b14047add79947d0331eb1590a0754486ca5a03c2ab9f7cade308973164924855e8293d7c0d905bae1d4295f7cb5efbafe9dea8a4d1b9125
 EBUILD zfs-0.8.2-r2.ebuild 5672 BLAKE2B 02538fc52c722905316084dc355fc2360abd784818e9ddb07a068567af038aa374004c83b95d4bea01ee75023469f24a87f1afffd0c21894c5c4234979e1ff37 SHA512 9fd338a8d9704ab43623b867a1a269cb2bcd2a54d651f8533d4d7fd6755013adc041f75b830ad147d48038eb0d594aad426b9e1ac65ff6f7376ad0582cff669d
-EBUILD zfs-9999.ebuild 5569 BLAKE2B a2030bb29de3e93238728b33f347865a338421929d4c263456ab16dc0c4388ee5a333455530afefef9c09036c995e0b416cc600ed9090f8b879330d5c951ab18 SHA512 bb0ab5184ff53381302179f4e4e122d31cec6517add9c9800a578e3453506548cb14f6d548fc2bef92246f32cc59378605d09892b29d862629b4f96041e3ebae
+EBUILD zfs-9999.ebuild 5401 BLAKE2B 1036d675756e7f3a9f372823b57578ef8996d994ca23a9e7a50b101321320edfd4df7b1d30182fce755d02945d6c46c79a54a1eef0fe2f74fc6e60b3f8f3c43d SHA512 6e92a22c166ce4bf1a4f5e14f03aeb540bd201f526b8c59d9a5ae57a69a507f40e0727fea787887f147572db0b99295cc955e8a5275866353366cddbccddb9f8
 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index b7ec33da576e..ccf810c825f2 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -45,19 +45,13 @@ BDEPEND="virtual/awk
 "
 
 RDEPEND="${DEPEND}
-	!=sys-apps/grep-2.13*
 	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
-	!sys-fs/zfs-fuse
 	!prefix? ( virtual/udev )
 	sys-fs/udev-init-scripts
 	rootfs? (
 		app-arch/cpio
 		app-misc/pax-utils
-		!<sys-boot/grub-2.00-r2:2
 		!<sys-kernel/genkernel-3.5.1.1
-		!<sys-kernel/genkernel-next-67
-		!<sys-kernel/bliss-initramfs-7.1.0
-		!<sys-kernel/dracut-044-r1
 	)
 	test-suite? (
 		sys-apps/util-linux
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index c32593ff49a4..59a3f24a476d 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 73830e10151e..fd43830bdcc2 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,6 +1,6 @@
 DIST libva-2.5.0.tar.bz2 459677 BLAKE2B d6e5bf94bcbda0a724634164bd8cf91efbdbe36120e62e7e7eefcd749afffec1950d8904318b472c81ae07490c559c68b0853725c654a08592457118cd5d6a83 SHA512 ffaeb9cf8ed1f93073c1cb3e58f5b3d3612e81622d02f8e428c089f625d4370b496b7681ac2fc2823c48670c9fd3da50893b1db51de768cf0f5d866e2ee78106
 DIST libva-2.6.1.tar.bz2 466497 BLAKE2B d4ea6e6d0102722206d94725932f0b3cf650bab3f02235f4c627dc83e5417b786f9524430d793f1067d002a0c9d7cbc92a7c740383c698d225a14946e1bb90ba SHA512 b57f0c0dda5ebadc92f56bc7fb835c2931cafffca9413fb4d244ea1dd47b603376323e6bebf144ccb2d2cf3499c64b101f8e03ff1809bd81242718d224d2d17d
 EBUILD libva-2.5.0-r1.ebuild 2186 BLAKE2B 7c9a9dc3f979909e02812398551197938bce437f0092940361853613fff9813e2d06af44f4e09130cb27ac4313722eba8b869ec0a8681532f07c6449ee4c0078 SHA512 2d8f8705c68d3a1bda268a18e8e65dc3e8d8f0d73fdcea6f6e8e5908028598f1a0e3865818ef37643bc6843af9dcb3f4fa9a167d021dbf67772937af2df721ed
-EBUILD libva-2.6.1.ebuild 2189 BLAKE2B 8d3879edcce5e57f4c7d1ca9ff71dda9f5aa0fe112b08ac9a30e12218d8bcc7e0917c493ef7783df7914020a696b8b8dbe1677ac97b8da92b683a80fc280fd7f SHA512 fbc7dcbba897843bd698ee785bc61616d709f7393e2a95f2a729903e1a8946ed7b22e6c94b87b3c08f1af6122072a89586f4910f1806cb9d106a30dc4e83bc4c
-EBUILD libva-9999.ebuild 2189 BLAKE2B a57e450dd0eaf80a440f5dafdbf48e1ea337ba897468bf831f11c89e412a03916f2c9190f06bea45215d34084311618d29089995af9cab7011f20ba3693725e2 SHA512 94cacf1f0eea1290e3e493ec7d7a30bbede70a9ad9d372c762c9905d01e9a2558bd31e9d5f4c80539d53ee25b7146744d28742add3676b7b1f9cd642a2962f74
+EBUILD libva-2.6.1.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
+EBUILD libva-9999.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
 MISC metadata.xml 469 BLAKE2B 86258c66689544ac1709503e76a23d84d090393d1358158b47ea2fd0936f5d3828c4be00ea8490a531f63956274b9411e3b698207899eaf98a6bcf2f88572145 SHA512 2ad27b3a2dadd6e89f2f6700cff4aa5a76ee2770f0daa8a3b523ec5c19718e333528fee6919c7df6d53c58368c67fcb3836aae256d61bf4d7e042d00ab9f74b4
diff --git a/x11-libs/libva/libva-2.6.1.ebuild b/x11-libs/libva/libva-2.6.1.ebuild
index c1266852c3f2..016d79e6442e 100644
--- a/x11-libs/libva/libva-2.6.1.ebuild
+++ b/x11-libs/libva/libva-2.6.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]] ; then # Live ebuild
 	AUTOTOOLS_AUTORECONF="yes"
 else
 	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index 00629ae44aeb..016d79e6442e 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]] ; then # Live ebuild
 	AUTOTOOLS_AUTORECONF="yes"
 else
 	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 908415942b65..f85f78ef3bac 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 0bbb28d5e78d..6324c1a64071 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,10 +1,6 @@
 AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a39eb80a871f8c0e21268302dc7baf5bfa13c9d1fe0c832ce008649764896c9ddab6dff1cd66c2c6d933e08e227a SHA512 b26d190bdaccca3cf761599a6e3f938a8f9106c9ee395c5f0bf3e58f5c151674621e66ad61891ec4e764424e42f315caa352761923d5c3b45ca326850e369ad9
 AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9374fe412a97ff6b82b545ec4f050e087b8982b4e16ebf9553c71e5b6c145e8a3b8b469b1b107def04f443c01c57efe9e947 SHA512 75431eac4c6eac56716a6e2ec0ca4f5fd88aa38761b758b58c5f8c3f3fd6eb4a111af9c74b2d7c14fc3e66cbc7f361b2b3bc8658cfb31fb827e01cf19a58df67
-DIST rofi-1.5.2.tar.xz 377732 BLAKE2B 560c5a4d30d143cbb5ca9030086d614a8f56a5e17b75c1b3f3a2e57bbd16de304b733bc4fd6093e716c993051e238811e9e65ffbf165d2ae4723f0bde1b15b42 SHA512 8fbbcaa040148d204878380f7cb96fa31228f72b68a97a5bcf8d8cd69740f6b185f5e5d2bc2e1d35e267a84b21576eb356c33be827fd1b767460665493360c16
-DIST rofi-1.5.3.tar.xz 383016 BLAKE2B 8898af3df161b668b506e5d56a031081c911efc2be37f2dc687e068b58afe906cf9d4186bb166fa953de98eb758d4d125443c6122ccd5c2a861b25cd0473f70c SHA512 6dc4b3c2818f4606e42e8185032788d40c4dae9e67596b3b7f767e8f6ca2963b85602baa4287474520ecdb8e333ae211fce5e7252f3b95e0f90b862040aad117
 DIST rofi-1.5.4.tar.gz 535259 BLAKE2B 8560dfee631c66a6f2178c0af6926ef317ed6d2cfe3ae46264e5b1ce429113ce810e4fed4c86a81acbbd51c85ad2593f40a39d982d7da0aa8ccc55537cadd2bb SHA512 181dedb0905bfab76f7ad313d299f4c80ee4efb11a2c6345b16044b7fb3f54bc7e304ee9352e562932e55108e328e5f6bd2c1d7fd9bcdec3d8022c2dc4f8d394
-EBUILD rofi-1.5.2-r1.ebuild 1081 BLAKE2B 641d5c54db41f33ab5af9517e90e3e490c7252451e713f112a6402bc6fc26b439422dd9e3be0e0c817dfce48a4a9fff9867d0aa5dd4cbf20eb80be77ea8d1a79 SHA512 4dc08ac1432671ffc5082c09d08e7f40fc19c68862db1b0aebb77c4ae9a37e4e985d41cf18b3005eee29eb3c060c3088b6bff4439ac07ac67557bad470b9e8ad
-EBUILD rofi-1.5.3-r1.ebuild 1083 BLAKE2B 6b7aa2ea9455df9474cbc4a4689b4df3edd5a868edde2fbd7624a9e87b8ffe68cf852c92eda272eecf27a2ae2faf31e30e3ac41fdebf86675bc419cf89621fc3 SHA512 95a62f9b6e453bd040983f87077c3627ca917936c935eb4637f59fde5e64dd5f692872057995e25d3f5c529741736ddbd054b2c542034ec9b8b66e19122e3d16
-EBUILD rofi-1.5.4-r1.ebuild 1083 BLAKE2B bd26a1e03668fdf881439b00fd9f4301b247c86df777e9a860c3b14f45eb0c0a4ad9e53cb9d2a2bf83db1aa97a94760f0616c1daa0490e7f1d1dd054e0ad3b38 SHA512 f3adbc65a8eadd2cd0e8c3e798b228a85d069f656e92bbfd1b20eaab72c81b77f75684d15cb85a6941de1c5176e5aae24a3d5e50f3d59d829e517292193edb85
+EBUILD rofi-1.5.4-r1.ebuild 1081 BLAKE2B 57e62dbf8e19448372d23438ffea0840144651434e6235798bc558be24d785d03d0e2143cab08b83abb39d3308446f42c46706f9aaa9edb690da1a9a7055a078 SHA512 456f687515cf00aa7826111d393056aea01159aacc88a408d66d5aef493a154ea9c823b57cd6b73ee593c0776d6f6e3d5a2ce94ccd7e97f523514d175778b236
 EBUILD rofi-99999.ebuild 1042 BLAKE2B 86d9f5a16bcb1badb899263302409d32fd049347648b255f5bd349c548e4acd72485a386b907236fe3cc97511a25e2d2a743e32dc1f1f71c39881fdeeeedd275 SHA512 981cd25e3025dfe0a2801ebde587c9786f61ca40fe7affc79ee9c3614286e6b23e4b2e9d06441fbdc63de1199b5f6b5c168863df9eaf89088813a41f2c0c6a7f
 MISC metadata.xml 495 BLAKE2B 0a6c59c1d1db2ae103cf8165f39dfda9beb4dad681379f6f6bed7cf3f0a44f06e9cbd77457dfea4bcb0c42e3df8c6e2c7c83ea4a9185e1a4131db214d26058cd SHA512 afcce018b90e20d190e8da510c57b27b92508a40972fc5e573c185561dd0daa3ce3fd57c689c2ec65902087aaec7d1273ed151abdc5c6be76706f694c1c9510f
diff --git a/x11-misc/rofi/rofi-1.5.2-r1.ebuild b/x11-misc/rofi/rofi-1.5.2-r1.ebuild
deleted file mode 100644
index 5e2e6bf96b48..000000000000
--- a/x11-misc/rofi/rofi-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://github.com/davatorium/rofi"
-SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test windowmode"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	gnome-base/librsvg:2
-	media-libs/freetype
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libxcb
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( >=dev-libs/check-0.11 )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
-	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-
-	econf \
-		$(use_enable test check) \
-		$(use_enable windowmode)
-}
diff --git a/x11-misc/rofi/rofi-1.5.3-r1.ebuild b/x11-misc/rofi/rofi-1.5.3-r1.ebuild
deleted file mode 100644
index 22201929529a..000000000000
--- a/x11-misc/rofi/rofi-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://github.com/davatorium/rofi"
-SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test windowmode"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	gnome-base/librsvg:2
-	media-libs/freetype
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libxcb
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( >=dev-libs/check-0.11 )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
-	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-
-	econf \
-		$(use_enable test check) \
-		$(use_enable windowmode)
-}
diff --git a/x11-misc/rofi/rofi-1.5.4-r1.ebuild b/x11-misc/rofi/rofi-1.5.4-r1.ebuild
index 11a4a5097e37..6d0d5474b2bf 100644
--- a/x11-misc/rofi/rofi-1.5.4-r1.ebuild
+++ b/x11-misc/rofi/rofi-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test windowmode"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 2d6a2023e795..bf534bd340c3 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 8d6d0a7d32df..bd7211e9abc7 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,9 +1,7 @@
-DIST xterm-327.tgz 1240131 BLAKE2B 7f009ec995fa9f8007cd5497d13f1120440df40ef0801da9be6c708e6e9a31e5c43ddb8fe1af1abfa24ce4c1c9e769bf8d74d0bd7acf94d172ea4cc10ddc177c SHA512 d9d9f3b870fea8db9ae3c076a9d85152488b2d392b9b1e2e4ebbeded287ed4911f1f63e5e035d5b3793b2506b993125c6fca437393b435a28aeb519d76147672
 DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b4153e169654fc441f1209c97a6d17bf3f880d0160a42e102ca8fd4a291c2b7d373269290a7bbebeeb8d SHA512 fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609
-DIST xterm-350.tgz 1399138 BLAKE2B 3665f1529d41b518dbd5650f74e2ccfb48969430823c68b396a3db962d6906664bd8bf359103e5b22d902bbe823637a246823c2244dfc1b068d16a89a4e87c99 SHA512 66e6cb37ebedd65c473b04cc31917e509f50652358414787a0a3f0b8f39ae957bf0aefe372576f82a698fccc6c45840cd4e4a2d8ce9f0b1fe5582ed88dae724f
 DIST xterm-351.tgz 1401009 BLAKE2B df32425affce33deb199710be118e90da7b1975882aaf92ff1ad5e976ac18f280cf7d72362d82c0ff9f9530d8da3ba133e345ff9de7f0ac0a2134200c9cc87e6 SHA512 941507be19ad062b39c57288c6e28a17f0ceba090a2d1c3f626f638e5333ca9b4c762fe2fbc42908adf7854b00d9a98cb6eb7481dfa50fd0125459f8ca385c00
-EBUILD xterm-327.ebuild 2580 BLAKE2B b8a798fa217765573354bc440d634357abbb8a253c25d61c2ac3ef01bb866ea490bc388ccf088c05dd12eb7b037160ab54d90b251f9075e85e7ed9d491da8387 SHA512 c0012a958c60088d148d50f38fe16a29e49ab1630ae2946f97083bb5e68943877eff31f3fba0bd94b9dc9afea477abef7469513dce9107eff12ef54a4661a183
+DIST xterm-352.tgz 1405420 BLAKE2B 46cedc409cb174fc1901bec31e190be64a07de34d59d0e767217384761dba7e98d97728fc8976f8a432eb80256471edeb2f4b58a61f875aaaa9b2cf20999f08e SHA512 9116f78dda685af75192f2fcd0ddff5244746f0e55b5e91ced6be0f85cb3dd78287bd873cf55ccb15901e98647df9cf8083b9ad84f53e12bae5134889aef82c0
 EBUILD xterm-337.ebuild 2623 BLAKE2B 17d463f661c556a5a95883c534738ee044c5923cfbf1276eff2e6110236c20b3f7eb98bd7ed9ee99a8f82305d91277b57de976dff9f0c29efe8f1496787e8876 SHA512 a90462462c7dbc7c375a14c1d3ccc7843510a0dffa688ef4017a3d4cb87e142a7477c8a7a312e56ff8e5e67fd40092a905aab9a9e4dcfe496a4cff399c5b7531
-EBUILD xterm-350.ebuild 2676 BLAKE2B 0972363f9da131fbc9e739422275eab0593813c052727fe1ed4aade41da67f3f42526386d6a872d7ef824e0e15ae4e083f3bfba59a3cfaf8dcd30df990c5e885 SHA512 4f9a183901c1c0b059ff85fdea79e25243fce8b134300067b1278bb061d3044099ce5d52b428e18378f7d32e2e51fdd4431f999630fb2e833725422a7d9482dc
 EBUILD xterm-351.ebuild 2639 BLAKE2B 0aed020658ae5b63f11fcdb22395a72f24153573525bc099cc316ec955f7d37c19e280dc63cefdfa796caba284ed907a92feabd1eed928751148733e3ffdc319 SHA512 a4674b958e3f3a2f92dd7735cff457941caea9c37460f24c9f79a1427f26240e978969834789225e83c178f1a970c761665256de2117bd9819ed8ba33f0f111b
+EBUILD xterm-352.ebuild 2639 BLAKE2B c6a6638503226412ad582323c3ed6fcf70919e5234a69cad8dc1682df83b1266a8dcfc3e0512b074d0c59d72830f0c30659b9215b67f50dd7700ca3893c1c8a5 SHA512 975e4d6a883603d2ebaa4310e52c80fdd77a046a9dc33ac7827108bcc1417858e4e2638249bf1706f543676dee78d88fea2a21274288176039be69213e6323f6
 MISC metadata.xml 461 BLAKE2B e2342778bf1a9f780a10a9215182a41019c65d1412fbd9d9e215a8660a1fac0e4c7d62842286b46ca659b42fc6c528cdcaa8697c465de652e1c8c0f0ae21c2d8 SHA512 34f61ee876ad6365efb4d9b69208b65b33bb47eeded0a1264ee9d2f9bec2e21ba2dd65852d3d0adf101a506a19d0a519e6612df84fe08b875c334dbb3341c581
diff --git a/x11-terms/xterm/xterm-327.ebuild b/x11-terms/xterm/xterm-327.ebuild
deleted file mode 100644
index 66ebfa773add..000000000000
--- a/x11-terms/xterm/xterm-327.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
-
-COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
-	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	>=sys-libs/ncurses-5.7-r7:0=
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-pkg_setup() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_configure() {
-	# 454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $(pkg-config --libs ncurses)
-
-	econf \
-		--libdir="${EPREFIX}"/etc \
-		--disable-full-tgetent \
-		--with-app-defaults="${DEFAULTS_DIR}" \
-		--disable-setuid \
-		--disable-setgid \
-		--with-utempter \
-		--with-x \
-		$(use_with Xaw3d) \
-		$(use_with xinerama) \
-		--disable-imake \
-		--enable-256-color \
-		--enable-broken-osc \
-		--enable-broken-st \
-		--enable-exec-xterm \
-		$(use_enable truetype freetype) \
-		--enable-i18n \
-		--enable-load-vt-fonts \
-		--enable-logging \
-		$(use_enable openpty) \
-		$(use_enable toolbar) \
-		$(use_enable unicode mini-luit) \
-		$(use_enable unicode luit) \
-		--enable-wide-chars \
-		--enable-dabbrev \
-		--enable-warnings
-}
-
-src_install() {
-	default
-
-	dohtml xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-350.ebuild b/x11-terms/xterm/xterm-350.ebuild
deleted file mode 100644
index 2055f8804100..000000000000
--- a/x11-terms/xterm/xterm-350.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic multilib
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
-
-BDEPEND="virtual/pkgconfig
-	x11-base/xorg-proto"
-DEPEND="kernel_linux? ( sys-libs/libutempter )
-	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	media-libs/fontconfig:1.0
-	>=sys-libs/ncurses-5.7-r7:0=
-	x11-apps/xmessage
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-pkg_setup() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_configure() {
-	# 454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $(pkg-config --libs ncurses)
-
-	local myeconfargs=(
-		--disable-full-tgetent
-		--disable-imake
-		--disable-setgid
-		--disable-setuid
-		--enable-256-color
-		--enable-broken-osc
-		--enable-broken-st
-		--enable-dabbrev
-		--enable-exec-xterm
-		--enable-i18n
-		--enable-load-vt-fonts
-		--enable-logging
-		--enable-screen-dumps
-		--enable-warnings
-		--enable-wide-chars
-		--libdir="${EPREFIX}"/etc
-		--with-app-defaults="${DEFAULTS_DIR}"
-		--with-utempter
-		--with-x
-		$(use_enable openpty)
-		$(use_enable sixel sixel-graphics)
-		$(use_enable toolbar)
-		$(use_enable truetype freetype)
-		$(use_enable unicode luit)
-		$(use_enable unicode mini-luit)
-		$(use_with Xaw3d)
-		$(use_with xinerama)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e 's:blue2$:blue:' "${ED}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 47360c5b0d8c..4171066f7b11 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/adwaita-qt/Manifest b/x11-themes/adwaita-qt/Manifest
index 58ed3d557ab4..69a431186628 100644
--- a/x11-themes/adwaita-qt/Manifest
+++ b/x11-themes/adwaita-qt/Manifest
@@ -1,5 +1,3 @@
-DIST adwaita-qt-1.1.0.tar.gz 435576 BLAKE2B e85e918e2527cc26f7804f1b03e75163b8c30d46402e3de3dca7afb93ac7abd81fe5e10b4d858859cf9abf443ec57cf74cc1ab578a45798dcb73d4b17da08cc5 SHA512 5203b64cb9e4038579c68ae8f52bc8c2fcdaf0ab46ce134f2a92b318493cc69718ce4d69968f1da20fcdf5f5492c38a6a225475f74f75390ada1337d35504a01
 DIST adwaita-qt-1.1.1.tar.gz 435566 BLAKE2B c8ca8df84ce06311b0937d994a859bb6e71a4a45570c179bdf3ded144bee06c93d8d80b300db3786b1bcc8db7f2b1d78423c8d8b0456079c4563924b2a036abc SHA512 6d11fc8eecc94da4f2e3798ee5147258f277032b23a82d5bf8d3414943ac89c5ebd056d519338959c72a8a45d1638ab8cfeac01b3f3fd1118b4c89eb0c8b5608
-EBUILD adwaita-qt-1.1.0.ebuild 863 BLAKE2B 94b0af51e01733a8d7d65d96834e87d4a499d316fb1a3a75bf95b6c688c792c5f3ce9edd70d5237a4c1f2b7d35c44d6c4dc43214155c35949d467458d9941213 SHA512 268f5771ae9964688bc08b5d8fabe8e15a6f9e1cde6eee90097cecce2d1305a89fde05b3393a58ca110694f2027b43457a6bf8d6daa2d9fb99266f7b708e29aa
 EBUILD adwaita-qt-1.1.1.ebuild 872 BLAKE2B d560355c9a638a9d4d261091761d07374a51592b6fad05f75894335499d4ccc1b8a00e54d7f3519598efeaf86fef6fa852a8c94dddc84b3f09f9f4d0f9479fa0 SHA512 426e8787277aff420a4871a9f4b865a6353f221baa26dc308681f2315cce5e46e87c916c10b5a8ee7d2c2d170a28d4f49741c76d0014830bbf88074679b4ab80
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/adwaita-qt/adwaita-qt-1.1.0.ebuild b/x11-themes/adwaita-qt/adwaita-qt-1.1.0.ebuild
deleted file mode 100644
index d2bd6b3baadb..000000000000
--- a/x11-themes/adwaita-qt/adwaita-qt-1.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils
-
-DESCRIPTION="A style to bend Qt applications to look like they belong into GNOME Shell"
-HOMEPAGE="https://github.com/FedoraQt/adwaita-qt"
-SRC_URI="https://github.com/FedoraQt/${PN}/archive/${PV}/${P}.tar.gz"
-
-KEYWORDS="amd64 ~ppc64 x86"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="gnome"
-
-RDEPEND="
-	gnome? ( x11-themes/QGnomePlatform )
-	dev-qt/qtwidgets:5
-	dev-qt/qtdbus:5
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	BUILD_DIR="${WORKDIR}/${PN}_qt5"
-	local mycmakeargs=( -DUSE_QT4=OFF )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	local _d
-	for _d in "${WORKDIR}"/${PN}_qt*; do
-		cmake-utils_src_compile -C "${_d}"
-	done
-}
-
-src_install() {
-	local _d
-	for _d in "${WORKDIR}"/${PN}_qt*; do
-		cmake-utils_src_install -C "${_d}"
-	done
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-22 18:41:30 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-22 18:41:30 +0000
commit	580f05ea8f512d11e23e8da80177d27835cbdbbc (patch)
tree	48f1c956bdc671653181038c8d67d35bc8569d41
parent	f29eb0598f62fc3b5f09f2de5a89c0437c6164d9 (diff)